From 4ba03be97e6cc7e790bbc9bfc18caaa228c8a262 Mon Sep 17 00:00:00 2001
From: Botahamec <botahamec@outlook.com>
Date: Fri, 28 Feb 2025 16:09:11 -0500
Subject: Scoped lock API

---
 src/mutex/guard.rs | 71 ++++++++----------------------------------------------
 1 file changed, 10 insertions(+), 61 deletions(-)

(limited to 'src/mutex/guard.rs')

diff --git a/src/mutex/guard.rs b/src/mutex/guard.rs
index 4e4d5f1..22e59c1 100644
--- a/src/mutex/guard.rs
+++ b/src/mutex/guard.rs
@@ -5,34 +5,14 @@ use std::ops::{Deref, DerefMut};
 
 use lock_api::RawMutex;
 
-use crate::key::Keyable;
 use crate::lockable::RawLock;
+use crate::ThreadKey;
 
 use super::{Mutex, MutexGuard, MutexRef};
 
 // These impls make things slightly easier because now you can use
 // `println!("{guard}")` instead of `println!("{}", *guard)`
 
-impl<T: PartialEq + ?Sized, R: RawMutex> PartialEq for MutexRef<'_, T, R> {
-	fn eq(&self, other: &Self) -> bool {
-		self.deref().eq(&**other)
-	}
-}
-
-impl<T: Eq + ?Sized, R: RawMutex> Eq for MutexRef<'_, T, R> {}
-
-impl<T: PartialOrd + ?Sized, R: RawMutex> PartialOrd for MutexRef<'_, T, R> {
-	fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-		self.deref().partial_cmp(&**other)
-	}
-}
-
-impl<T: Ord + ?Sized, R: RawMutex> Ord for MutexRef<'_, T, R> {
-	fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-		self.deref().cmp(&**other)
-	}
-}
-
 #[mutants::skip] // hashing involves RNG and is hard to test
 #[cfg(not(tarpaulin_include))]
 impl<T: Hash + ?Sized, R: RawMutex> Hash for MutexRef<'_, T, R> {
@@ -107,39 +87,9 @@ impl<'a, T: ?Sized, R: RawMutex> MutexRef<'a, T, R> {
 // it's kinda annoying to re-implement some of this stuff on guards
 // there's nothing i can do about that
 
-#[mutants::skip] // it's hard to get two guards safely
-#[cfg(not(tarpaulin_include))]
-impl<T: PartialEq + ?Sized, R: RawMutex, Key: Keyable> PartialEq for MutexGuard<'_, '_, T, Key, R> {
-	fn eq(&self, other: &Self) -> bool {
-		self.deref().eq(&**other)
-	}
-}
-
-#[mutants::skip] // it's hard to get two guards safely
-#[cfg(not(tarpaulin_include))]
-impl<T: Eq + ?Sized, R: RawMutex, Key: Keyable> Eq for MutexGuard<'_, '_, T, Key, R> {}
-
-#[mutants::skip] // it's hard to get two guards safely
-#[cfg(not(tarpaulin_include))]
-impl<T: PartialOrd + ?Sized, R: RawMutex, Key: Keyable> PartialOrd
-	for MutexGuard<'_, '_, T, Key, R>
-{
-	fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-		self.deref().partial_cmp(&**other)
-	}
-}
-
-#[mutants::skip] // it's hard to get two guards safely
-#[cfg(not(tarpaulin_include))]
-impl<T: Ord + ?Sized, R: RawMutex, Key: Keyable> Ord for MutexGuard<'_, '_, T, Key, R> {
-	fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-		self.deref().cmp(&**other)
-	}
-}
-
 #[mutants::skip] // hashing involves RNG and is hard to test
 #[cfg(not(tarpaulin_include))]
-impl<T: Hash + ?Sized, R: RawMutex, Key: Keyable> Hash for MutexGuard<'_, '_, T, Key, R> {
+impl<T: Hash + ?Sized, R: RawMutex> Hash for MutexGuard<'_, T, R> {
 	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
 		self.deref().hash(state)
 	}
@@ -147,19 +97,19 @@ impl<T: Hash + ?Sized, R: RawMutex, Key: Keyable> Hash for MutexGuard<'_, '_, T,
 
 #[mutants::skip]
 #[cfg(not(tarpaulin_include))]
-impl<T: Debug + ?Sized, Key: Keyable, R: RawMutex> Debug for MutexGuard<'_, '_, T, Key, R> {
+impl<T: Debug + ?Sized, R: RawMutex> Debug for MutexGuard<'_, T, R> {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		Debug::fmt(&**self, f)
 	}
 }
 
-impl<T: Display + ?Sized, Key: Keyable, R: RawMutex> Display for MutexGuard<'_, '_, T, Key, R> {
+impl<T: Display + ?Sized, R: RawMutex> Display for MutexGuard<'_, T, R> {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		Display::fmt(&**self, f)
 	}
 }
 
-impl<T: ?Sized, Key: Keyable, R: RawMutex> Deref for MutexGuard<'_, '_, T, Key, R> {
+impl<T: ?Sized, R: RawMutex> Deref for MutexGuard<'_, T, R> {
 	type Target = T;
 
 	fn deref(&self) -> &Self::Target {
@@ -167,33 +117,32 @@ impl<T: ?Sized, Key: Keyable, R: RawMutex> Deref for MutexGuard<'_, '_, T, Key,
 	}
 }
 
-impl<T: ?Sized, Key: Keyable, R: RawMutex> DerefMut for MutexGuard<'_, '_, T, Key, R> {
+impl<T: ?Sized, R: RawMutex> DerefMut for MutexGuard<'_, T, R> {
 	fn deref_mut(&mut self) -> &mut Self::Target {
 		&mut self.mutex
 	}
 }
 
-impl<T: ?Sized, Key: Keyable, R: RawMutex> AsRef<T> for MutexGuard<'_, '_, T, Key, R> {
+impl<T: ?Sized, R: RawMutex> AsRef<T> for MutexGuard<'_, T, R> {
 	fn as_ref(&self) -> &T {
 		self
 	}
 }
 
-impl<T: ?Sized, Key: Keyable, R: RawMutex> AsMut<T> for MutexGuard<'_, '_, T, Key, R> {
+impl<T: ?Sized, R: RawMutex> AsMut<T> for MutexGuard<'_, T, R> {
 	fn as_mut(&mut self) -> &mut T {
 		self
 	}
 }
 
-impl<'a, T: ?Sized, Key: Keyable, R: RawMutex> MutexGuard<'a, '_, T, Key, R> {
+impl<'a, T: ?Sized, R: RawMutex> MutexGuard<'a, T, R> {
 	/// Create a guard to the given mutex. Undefined if multiple guards to the
 	/// same mutex exist at once.
 	#[must_use]
-	pub(super) unsafe fn new(mutex: &'a Mutex<T, R>, thread_key: Key) -> Self {
+	pub(super) unsafe fn new(mutex: &'a Mutex<T, R>, thread_key: ThreadKey) -> Self {
 		Self {
 			mutex: MutexRef(mutex, PhantomData),
 			thread_key,
-			_phantom: PhantomData,
 		}
 	}
 }
-- 
cgit v1.2.3