From 129c13c21254ca104bddf020170edaca1fb7107d Mon Sep 17 00:00:00 2001 From: Mica White Date: Wed, 25 Dec 2024 22:49:42 -0500 Subject: Implement common traits --- src/collection/boxed.rs | 1 - src/collection/guard.rs | 27 +++++++++++++++++++++++++++ src/collection/retry.rs | 8 ++++---- 3 files changed, 31 insertions(+), 5 deletions(-) (limited to 'src/collection') diff --git a/src/collection/boxed.rs b/src/collection/boxed.rs index fca1db2..2397bd3 100644 --- a/src/collection/boxed.rs +++ b/src/collection/boxed.rs @@ -1,4 +1,3 @@ -use std::alloc::Layout; use std::cell::UnsafeCell; use std::fmt::Debug; use std::marker::PhantomData; diff --git a/src/collection/guard.rs b/src/collection/guard.rs index d604680..fc8df30 100644 --- a/src/collection/guard.rs +++ b/src/collection/guard.rs @@ -1,10 +1,37 @@ use std::fmt::{Debug, Display}; +use std::hash::Hash; use std::ops::{Deref, DerefMut}; use crate::key::Keyable; use super::LockGuard; +impl PartialEq for LockGuard<'_, Guard, Key> { + fn eq(&self, other: &Self) -> bool { + self.guard.eq(&other.guard) + } +} + +impl PartialOrd for LockGuard<'_, Guard, Key> { + fn partial_cmp(&self, other: &Self) -> Option { + self.guard.partial_cmp(&other.guard) + } +} + +impl Eq for LockGuard<'_, Guard, Key> {} + +impl Ord for LockGuard<'_, Guard, Key> { + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + self.guard.cmp(&other.guard) + } +} + +impl Hash for LockGuard<'_, Guard, Key> { + fn hash(&self, state: &mut H) { + self.guard.hash(state) + } +} + impl Debug for LockGuard<'_, Guard, Key> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { Debug::fmt(&**self, f) diff --git a/src/collection/retry.rs b/src/collection/retry.rs index 3f5d471..687c5ec 100644 --- a/src/collection/retry.rs +++ b/src/collection/retry.rs @@ -1,3 +1,7 @@ +use std::cell::RefCell; +use std::collections::HashSet; +use std::marker::PhantomData; + use crate::collection::utils; use crate::handle_unwind::handle_unwind; use crate::lockable::{ @@ -5,10 +9,6 @@ use crate::lockable::{ }; use crate::Keyable; -use std::cell::RefCell; -use std::collections::HashSet; -use std::marker::PhantomData; - use super::{LockGuard, RetryingLockCollection}; /// Get all raw locks in the collection -- cgit v1.2.3