Scoped lock API

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/evil_rwlock.rs b/tests/evil_rwlock.rs
index 234847c..9eed8a8 100644
--- a/tests/evil_rwlock.rs
+++ b/tests/evil_rwlock.rs
@@ -53,16 +53,16 @@ fn boxed_rwlocks() {
 	let c_useless = Arc::clone(&useless_mutex);
 
 	let r = std::thread::spawn(move || {
-		let mut key = ThreadKey::get().unwrap();
+		let key = ThreadKey::get().unwrap();
 		let collection = BoxedLockCollection::try_new((&*c_good, &*c_evil, &*c_useless)).unwrap();
-		collection.lock(&mut key);
+		_ = collection.lock(key);
 	})
 	.join();
 
 	assert!(r.is_err());
-	assert!(good_mutex.try_write(&mut key).is_ok());
-	assert!(evil_mutex.try_write(&mut key).is_err());
-	assert!(useless_mutex.try_write(&mut key).is_ok());
+	assert!(good_mutex.scoped_try_write(&mut key, |_| {}).is_ok());
+	assert!(evil_mutex.scoped_try_write(&mut key, |_| {}).is_err());
+	assert!(useless_mutex.scoped_try_write(&mut key, |_| {}).is_ok());
 }
 
 #[test]
@@ -76,15 +76,15 @@ fn retrying_rwlocks() {
 	let c_useless = Arc::clone(&useless_mutex);
 
 	let r = std::thread::spawn(move || {
-		let mut key = ThreadKey::get().unwrap();
+		let key = ThreadKey::get().unwrap();
 		let collection =
 			RetryingLockCollection::try_new((&*c_good, &*c_evil, &*c_useless)).unwrap();
-		collection.lock(&mut key);
+		collection.lock(key);
 	})
 	.join();
 
 	assert!(r.is_err());
-	assert!(good_mutex.try_write(&mut key).is_ok());
-	assert!(evil_mutex.try_write(&mut key).is_err());
-	assert!(useless_mutex.try_write(&mut key).is_ok());
+	assert!(good_mutex.scoped_try_write(&mut key, |_| {}).is_ok());
+	assert!(evil_mutex.scoped_try_write(&mut key, |_| {}).is_err());
+	assert!(useless_mutex.scoped_try_write(&mut key, |_| {}).is_ok());
 }