X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fsync%2Fdebug_sync.rs;h=11824d5bc73182ebf3d77fc53dd7a53b2be59045;hb=0188861585db577723c4adedc43acd0f975944a5;hp=5b6acbcadd5bf38686f8ec43dc761eae6a9e3ba1;hpb=6ddf69c93b1c3e418251ed7a898efd943e47bc30;p=rust-lightning

diff --git a/lightning/src/sync/debug_sync.rs b/lightning/src/sync/debug_sync.rs
index 5b6acbca..11824d5b 100644
--- a/lightning/src/sync/debug_sync.rs
+++ b/lightning/src/sync/debug_sync.rs
@@ -129,7 +129,7 @@ impl LockMetadata {
 			// For each lock which is currently locked, check that no lock's locked-before
 			// set includes the lock we're about to lock, which would imply a lockorder
 			// inversion.
-			for (locked_idx, locked) in held.borrow().iter() {
+			for (locked_idx, _locked) in held.borrow().iter() {
 				if *locked_idx == this.lock_idx {
 					// Note that with `feature = "backtrace"` set, we may be looking at different
 					// instances of the same lock. Still, doing so is quite risky, a total order
@@ -143,7 +143,7 @@ impl LockMetadata {
 					panic!("Tried to acquire a lock while it was held!");
 				}
 			}
-			for (locked_idx, locked) in held.borrow().iter() {
+			for (_locked_idx, locked) in held.borrow().iter() {
 				for (locked_dep_idx, _locked_dep) in locked.locked_before.lock().unwrap().iter() {
 					if *locked_dep_idx == this.lock_idx && *locked_dep_idx != locked.lock_idx {
 						#[cfg(feature = "backtrace")]
@@ -201,6 +201,11 @@ pub struct Mutex<T: Sized> {
 	inner: StdMutex<T>,
 	deps: Arc<LockMetadata>,
 }
+impl<T: Sized> Mutex<T> {
+	pub(crate) fn into_inner(self) -> LockResult<T> {
+		self.inner.into_inner().map_err(|_| ())
+	}
+}
 
 #[must_use = "if unused the Mutex will immediately unlock"]
 pub struct MutexGuard<'a, T: Sized + 'a> {