From 482b47f4ed786946acb324b60d9f7ae7dd8cc075 Mon Sep 17 00:00:00 2001 From: Mica White Date: Sat, 14 Mar 2026 21:33:50 -0400 Subject: Apply clippy restrictions --- src/rwlock/read_guard.rs | 2 +- src/rwlock/rwlock.rs | 24 ++++++++++++++---------- src/rwlock/write_guard.rs | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'src/rwlock') diff --git a/src/rwlock/read_guard.rs b/src/rwlock/read_guard.rs index 5b26c06..f3161f5 100755 --- a/src/rwlock/read_guard.rs +++ b/src/rwlock/read_guard.rs @@ -5,7 +5,7 @@ use std::ops::Deref; use lock_api::RawRwLock; -use crate::lockable::RawLock; +use crate::lockable::RawLock as _; use crate::ThreadKey; use super::{RwLock, RwLockReadGuard, RwLockReadRef}; diff --git a/src/rwlock/rwlock.rs b/src/rwlock/rwlock.rs index b93d8e2..6adf73a 100755 --- a/src/rwlock/rwlock.rs +++ b/src/rwlock/rwlock.rs @@ -573,11 +573,13 @@ impl RwLock { /// Attempts to create a shared lock without a key. Locking this without /// exclusive access to the key is undefined behavior. pub(crate) unsafe fn try_read_no_key(&self) -> Option> { - if self.raw_try_read() { - // safety: the lock is locked first - Some(RwLockReadRef(self, PhantomData)) - } else { - None + unsafe { + if self.raw_try_read() { + // safety: the lock is locked first + Some(RwLockReadRef(self, PhantomData)) + } else { + None + } } } @@ -585,11 +587,13 @@ impl RwLock { /// without exclusive access to the key is undefined behavior. #[cfg(test)] pub(crate) unsafe fn try_write_no_key(&self) -> Option> { - if self.raw_try_write() { - // safety: the lock is locked first - Some(RwLockWriteRef(self, PhantomData)) - } else { - None + unsafe { + if self.raw_try_write() { + // safety: the lock is locked first + Some(RwLockWriteRef(self, PhantomData)) + } else { + None + } } } diff --git a/src/rwlock/write_guard.rs b/src/rwlock/write_guard.rs index c7676b5..823f7a4 100755 --- a/src/rwlock/write_guard.rs +++ b/src/rwlock/write_guard.rs @@ -5,7 +5,7 @@ use std::ops::{Deref, DerefMut}; use lock_api::RawRwLock; -use crate::lockable::RawLock; +use crate::lockable::RawLock as _; use crate::ThreadKey; use super::{RwLock, RwLockWriteGuard, RwLockWriteRef}; -- cgit v1.2.3