From ef34f899313ed4e4c5e452aef2c670f7d51f1ca9 Mon Sep 17 00:00:00 2001
From: Mica White <botahamec@outlook.com>
Date: Mon, 11 Mar 2024 22:26:02 -0400
Subject: Further fixes to trait bounds

---
 src/mutex.rs              | 1 -
 src/mutex/guard.rs        | 8 +-------
 src/rwlock/write_guard.rs | 7 +------
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/mutex.rs b/src/mutex.rs
index 431eedc..ed8d4a4 100644
--- a/src/mutex.rs
+++ b/src/mutex.rs
@@ -49,6 +49,5 @@ pub struct MutexRef<'a, T: ?Sized + 'a, R: RawMutex>(&'a Mutex<T, R>);
 pub struct MutexGuard<'a, 'key: 'a, T: ?Sized + 'a, Key: Keyable + 'key, R: RawMutex> {
 	mutex: MutexRef<'a, T, R>,
 	thread_key: Key,
-	_phantom1: PhantomData<*const ()>, // implement !Send
 	_phantom2: PhantomData<&'key ()>,
 }
diff --git a/src/mutex/guard.rs b/src/mutex/guard.rs
index 5a2a2c1..f57926d 100644
--- a/src/mutex/guard.rs
+++ b/src/mutex/guard.rs
@@ -61,15 +61,9 @@ impl<'a, 'key: 'a, T: ?Sized + 'a, Key: Keyable, R: RawMutex> MutexGuard<'a, 'ke
 		Self {
 			mutex: MutexRef(mutex),
 			thread_key,
-			_phantom1: PhantomData,
 			_phantom2: PhantomData,
 		}
 	}
 }
 
-unsafe impl<'a, T: ?Sized + 'a, R: RawMutex> Sync for MutexRef<'a, T, R> {}
-
-unsafe impl<'a, 'key: 'a, T: ?Sized + Sync, Key: Keyable + 'key, R: RawMutex> Sync
-	for MutexGuard<'_, 'key, T, Key, R>
-{
-}
+unsafe impl<'a, T: ?Sized + Send + 'a, R: RawMutex + Sync + 'a> Sync for MutexRef<'a, T, R> {}
diff --git a/src/rwlock/write_guard.rs b/src/rwlock/write_guard.rs
index 9350425..09fb898 100644
--- a/src/rwlock/write_guard.rs
+++ b/src/rwlock/write_guard.rs
@@ -69,9 +69,4 @@ impl<'a, 'key: 'a, T: ?Sized + 'a, Key: Keyable, R: RawRwLock>
 	}
 }
 
-unsafe impl<'a, T: ?Sized + 'a, R: RawRwLock> Sync for RwLockWriteRef<'a, T, R> {}
-
-unsafe impl<'a, 'key: 'a, T: ?Sized + 'a, Key: Keyable, R: RawRwLock> Sync
-	for RwLockWriteGuard<'a, 'key, T, Key, R>
-{
-}
+unsafe impl<'a, T: ?Sized + 'a, R: RawRwLock + Sync + 'a> Sync for RwLockWriteRef<'a, T, R> {}
-- 
cgit v1.2.3