X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fsync%2Fnostd_sync.rs;h=27cfb9b8f782c4bafabecd5180a5d0d2256105c3;hb=66060cae8af6969373bb16b73064b8ea3a7b689a;hp=08d54a939be66ecccb83d30c0569d25f31a523e1;hpb=a5ecb851716bc0819586894232653ec4b5e2c67f;p=rust-lightning diff --git a/lightning/src/sync/nostd_sync.rs b/lightning/src/sync/nostd_sync.rs index 08d54a93..27cfb9b8 100644 --- a/lightning/src/sync/nostd_sync.rs +++ b/lightning/src/sync/nostd_sync.rs @@ -49,7 +49,7 @@ impl Mutex { impl<'a, T: 'a> LockTestExt<'a> for Mutex { #[inline] fn held_by_thread(&self) -> LockHeldState { - if self.lock().is_err() { return LockHeldState::HeldByThread; } + if self.inner.try_borrow_mut().is_err() { return LockHeldState::HeldByThread; } else { return LockHeldState::NotHeldByThread; } } type ExclLock = MutexGuard<'a, T>; @@ -115,7 +115,7 @@ impl RwLock { impl<'a, T: 'a> LockTestExt<'a> for RwLock { #[inline] fn held_by_thread(&self) -> LockHeldState { - if self.write().is_err() { return LockHeldState::HeldByThread; } + if self.inner.try_borrow_mut().is_err() { return LockHeldState::HeldByThread; } else { return LockHeldState::NotHeldByThread; } } type ExclLock = RwLockWriteGuard<'a, T>;