Remove scopeguard

The scopeguard crate was being used for its `defer_on_unwind` macro.
The problem was that it runs even if the runtime was already panicking.
There aren't any changes to the macro which could have fixed this.
I instead wrote my own function to check for a specific panicking closure.

1 files changed, 2 insertions, 21 deletions

diff --git a/src/collection/ref.rs b/src/collection/ref.rs
index 31ef173..b0b142e 100644
--- a/src/collection/ref.rs
+++ b/src/collection/ref.rs
@@ -1,4 +1,3 @@
-use std::cell::RefCell;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
@@ -53,16 +52,7 @@ unsafe impl<L: Lockable> RawLock for RefLockCollection<'_, L> {
 	}
 
 	unsafe fn raw_lock(&self) {
-		let locks = &self.locks;
-		let locked = RefCell::new(Vec::with_capacity(locks.len()));
-		scopeguard::defer_on_unwind! {
-			utils::attempt_to_recover_locks_from_panic(&locked)
-		};
-
-		for lock in &self.locks {
-			lock.raw_lock();
-			locked.borrow_mut().push(*lock);
-		}
+		utils::ordered_lock(&self.locks)
 	}
 
 	unsafe fn raw_try_lock(&self) -> bool {
@@ -76,16 +66,7 @@ unsafe impl<L: Lockable> RawLock for RefLockCollection<'_, L> {
 	}
 
 	unsafe fn raw_read(&self) {
-		let locks = &self.locks;
-		let locked = RefCell::new(Vec::with_capacity(locks.len()));
-		scopeguard::defer_on_unwind! {
-			utils::attempt_to_recover_reads_from_panic(&locked)
-		};
-
-		for lock in &self.locks {
-			lock.raw_read();
-			locked.borrow_mut().push(*lock);
-		}
+		utils::ordered_read(&self.locks)
 	}
 
 	unsafe fn raw_try_read(&self) -> bool {