diff options
Diffstat (limited to 'tests/evil_mutex.rs')
| -rw-r--r-- | tests/evil_mutex.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/evil_mutex.rs b/tests/evil_mutex.rs index 361fe4c..e10acc8 100644 --- a/tests/evil_mutex.rs +++ b/tests/evil_mutex.rs @@ -41,16 +41,16 @@ fn boxed_mutexes() { 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_lock(&mut key).is_ok()); - assert!(evil_mutex.try_lock(&mut key).is_err()); - assert!(useless_mutex.try_lock(&mut key).is_ok()); + assert!(good_mutex.scoped_try_lock(&mut key, |_| {}).is_ok()); + assert!(evil_mutex.scoped_try_lock(&mut key, |_| {}).is_err()); + assert!(useless_mutex.scoped_try_lock(&mut key, |_| {}).is_ok()); } #[test] @@ -64,15 +64,15 @@ fn retrying_mutexes() { 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_lock(&mut key).is_ok()); - assert!(evil_mutex.try_lock(&mut key).is_err()); - assert!(useless_mutex.try_lock(&mut key).is_ok()); + assert!(good_mutex.scoped_try_lock(&mut key, |_| {}).is_ok()); + assert!(evil_mutex.scoped_try_lock(&mut key, |_| {}).is_err()); + assert!(useless_mutex.scoped_try_lock(&mut key, |_| {}).is_ok()); } |