f drop unused skip_checks bool

Author: TheBlueMatt

lightning/src/debug_sync.rs

@@ -67,7 +67,6 @@ impl std::hash::Hash for MutexMetadata {
 pub struct Mutex<T: Sized> {
 	inner: StdMutex<T>,
 	deps: Arc<MutexMetadata>,
-	skip_checks: bool
 }
 
 #[must_use = "if unused the Mutex will immediately unlock"]
@@ -119,47 +118,42 @@ impl<T> Mutex<T> {
 				#[cfg(feature = "backtrace")]
 				mutex_construction_bt: Backtrace::new(),
 			}),
-			skip_checks: false,
 		}
 	}
 
 	pub fn lock<'a>(&'a self) -> LockResult<MutexGuard<'a, T>> {
-		if !self.skip_checks {
-			MUTEXES_HELD.with(|held| {
-				// For each mutex which is currently locked, check that no mutex's locked-before
-				// set includes the mutex we're about to lock, which would imply a lockorder
-				// inversion.
-				for locked in held.borrow().iter() {
-					for locked_dep in locked.locked_before.lock().unwrap().iter() {
-						if *locked_dep == self.deps {
-							#[cfg(feature = "backtrace")]
-							panic!("Tried to violate existing lockorder.\nMutex that should be locked after the current lock was created at the following backtrace.\nNote that to get a backtrace for the lockorder violation, you should set RUST_BACKTRACE=1\n{:?}", locked.mutex_construction_bt);
-							#[cfg(not(feature = "backtrace"))]
-							panic!("Tried to violate existing lockorder. Build with the backtrace feature for more info.");
-						}
+		MUTEXES_HELD.with(|held| {
+			// For each mutex which is currently locked, check that no mutex's locked-before
+			// set includes the mutex we're about to lock, which would imply a lockorder
+			// inversion.
+			for locked in held.borrow().iter() {
+				for locked_dep in locked.locked_before.lock().unwrap().iter() {
+					if *locked_dep == self.deps {
+						#[cfg(feature = "backtrace")]
+						panic!("Tried to violate existing lockorder.\nMutex that should be locked after the current lock was created at the following backtrace.\nNote that to get a backtrace for the lockorder violation, you should set RUST_BACKTRACE=1\n{:?}", locked.mutex_construction_bt);
+						#[cfg(not(feature = "backtrace"))]
+						panic!("Tried to violate existing lockorder. Build with the backtrace feature for more info.");
 					}
-					// Insert any already-held mutexes in our locked-before set.
-					self.deps.locked_before.lock().unwrap().insert(Arc::clone(locked));
 				}
-				held.borrow_mut().insert(Arc::clone(&self.deps));
-			});
-		}
+				// Insert any already-held mutexes in our locked-before set.
+				self.deps.locked_before.lock().unwrap().insert(Arc::clone(locked));
+			}
+			held.borrow_mut().insert(Arc::clone(&self.deps));
+		});
 		self.inner.lock().map(|lock| MutexGuard { mutex: self, lock }).map_err(|_| ())
 	}
 
 	pub fn try_lock<'a>(&'a self) -> LockResult<MutexGuard<'a, T>> {
 		let res = self.inner.try_lock().map(|lock| MutexGuard { mutex: self, lock }).map_err(|_| ());
-		if !self.skip_checks && res.is_ok() {
-			MUTEXES_HELD.with(|held| {
-				// Since a try-lock will simply fail if the lock is held already, we do not
-				// consider try-locks to ever generate lockorder inversions. However, if a try-lock
-				// succeeds, we do consider it to have created lockorder dependencies.
-				for locked in held.borrow().iter() {
-					self.deps.locked_before.lock().unwrap().insert(Arc::clone(locked));
-				}
-				held.borrow_mut().insert(Arc::clone(&self.deps));
-			});
-		}
+		MUTEXES_HELD.with(|held| {
+			// Since a try-lock will simply fail if the lock is held already, we do not
+			// consider try-locks to ever generate lockorder inversions. However, if a try-lock
+			// succeeds, we do consider it to have created lockorder dependencies.
+			for locked in held.borrow().iter() {
+				self.deps.locked_before.lock().unwrap().insert(Arc::clone(locked));
+			}
+			held.borrow_mut().insert(Arc::clone(&self.deps));
+		});
 		res
 	}
 }