Correctly mark mutex reference as unused

This commit is contained in:
2022-05-01 11:50:50 +02:00
parent ef421e20eb
commit 3b9b908460

View File

@@ -97,7 +97,7 @@ pub struct TracingMutex<T> {
#[derive(Debug)] #[derive(Debug)]
pub struct TracingMutexGuard<'a, T> { pub struct TracingMutexGuard<'a, T> {
inner: MutexGuard<'a, T>, inner: MutexGuard<'a, T>,
mutex: BorrowedMutex<'a>, _mutex: BorrowedMutex<'a>,
} }
fn map_lockresult<T, I, F>(result: LockResult<I>, mapper: F) -> LockResult<T> fn map_lockresult<T, I, F>(result: LockResult<I>, mapper: F) -> LockResult<T>
@@ -144,7 +144,7 @@ impl<T> TracingMutex<T> {
let result = self.inner.lock(); let result = self.inner.lock();
let mapper = |guard| TracingMutexGuard { let mapper = |guard| TracingMutexGuard {
mutex, _mutex: mutex,
inner: guard, inner: guard,
}; };
@@ -163,7 +163,7 @@ impl<T> TracingMutex<T> {
let result = self.inner.try_lock(); let result = self.inner.try_lock();
let mapper = |guard| TracingMutexGuard { let mapper = |guard| TracingMutexGuard {
mutex, _mutex: mutex,
inner: guard, inner: guard,
}; };
@@ -227,7 +227,7 @@ pub struct TracingRwLock<T> {
#[derive(Debug)] #[derive(Debug)]
pub struct TracingRwLockGuard<'a, L> { pub struct TracingRwLockGuard<'a, L> {
inner: L, inner: L,
mutex: BorrowedMutex<'a>, _mutex: BorrowedMutex<'a>,
} }
/// Wrapper around [`std::sync::RwLockReadGuard`]. /// Wrapper around [`std::sync::RwLockReadGuard`].
@@ -254,7 +254,10 @@ impl<T> TracingRwLock<T> {
let mutex = self.id.get_borrowed(); let mutex = self.id.get_borrowed();
let result = self.inner.read(); let result = self.inner.read();
map_lockresult(result, |inner| TracingRwLockGuard { inner, mutex }) map_lockresult(result, |inner| TracingRwLockGuard {
inner,
_mutex: mutex,
})
} }
/// Wrapper for [`std::sync::RwLock::write`]. /// Wrapper for [`std::sync::RwLock::write`].
@@ -268,7 +271,10 @@ impl<T> TracingRwLock<T> {
let mutex = self.id.get_borrowed(); let mutex = self.id.get_borrowed();
let result = self.inner.write(); let result = self.inner.write();
map_lockresult(result, |inner| TracingRwLockGuard { inner, mutex }) map_lockresult(result, |inner| TracingRwLockGuard {
inner,
_mutex: mutex,
})
} }
/// Wrapper for [`std::sync::RwLock::try_read`]. /// Wrapper for [`std::sync::RwLock::try_read`].
@@ -282,7 +288,10 @@ impl<T> TracingRwLock<T> {
let mutex = self.id.get_borrowed(); let mutex = self.id.get_borrowed();
let result = self.inner.try_read(); let result = self.inner.try_read();
map_trylockresult(result, |inner| TracingRwLockGuard { inner, mutex }) map_trylockresult(result, |inner| TracingRwLockGuard {
inner,
_mutex: mutex,
})
} }
/// Wrapper for [`std::sync::RwLock::try_write`]. /// Wrapper for [`std::sync::RwLock::try_write`].
@@ -296,7 +305,10 @@ impl<T> TracingRwLock<T> {
let mutex = self.id.get_borrowed(); let mutex = self.id.get_borrowed();
let result = self.inner.try_write(); let result = self.inner.try_write();
map_trylockresult(result, |inner| TracingRwLockGuard { inner, mutex }) map_trylockresult(result, |inner| TracingRwLockGuard {
inner,
_mutex: mutex,
})
} }
/// Return a mutable reference to the underlying data. /// Return a mutable reference to the underlying data.