Skip to content

Commit 22bd6af

Browse files
committed
fix newly introduced clippy lints
1 parent a0df3a1 commit 22bd6af

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/lock.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use parking_lot_core::{ParkToken, SpinWait, UnparkToken};
44
pub type RwLock<T> = lock_api::RwLock<RawRwLock, T>;
55
pub type RwLockReadGuard<'a, T> = lock_api::RwLockReadGuard<'a, RawRwLock, T>;
66
pub type RwLockWriteGuard<'a, T> = lock_api::RwLockWriteGuard<'a, RawRwLock, T>;
7-
pub type RwLockReadGuardDetached<'a> = crate::util::RwLockReadGuardDetached<'a, RawRwLock>;
8-
pub type RwLockWriteGuardDetached<'a> = crate::util::RwLockWriteGuardDetached<'a, RawRwLock>;
7+
pub(crate) type RwLockReadGuardDetached<'a> = crate::util::RwLockReadGuardDetached<'a, RawRwLock>;
8+
pub(crate) type RwLockWriteGuardDetached<'a> = crate::util::RwLockWriteGuardDetached<'a, RawRwLock>;
99

1010
const READERS_PARKED: usize = 0b0001;
1111
const WRITERS_PARKED: usize = 0b0010;

src/mapref/multiple.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl<'a, K: Eq + Hash, V> RefMulti<'a, K, V> {
2727
}
2828

2929
pub fn pair(&self) -> (&K, &V) {
30-
(&*self.k, &*self.v)
30+
(self.k, self.v)
3131
}
3232
}
3333

@@ -71,11 +71,11 @@ impl<'a, K: Eq + Hash, V> RefMutMulti<'a, K, V> {
7171
}
7272

7373
pub fn pair(&self) -> (&K, &V) {
74-
(&*self.k, &*self.v)
74+
(self.k, self.v)
7575
}
7676

7777
pub fn pair_mut(&mut self) -> (&K, &mut V) {
78-
(&*self.k, &mut *self.v)
78+
(self.k, self.v)
7979
}
8080
}
8181

src/mapref/one.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl<'a, K: Eq + Hash, V> Ref<'a, K, V> {
2727
}
2828

2929
pub fn pair(&self) -> (&K, &V) {
30-
(&*self.k, &*self.v)
30+
(self.k, self.v)
3131
}
3232

3333
pub fn map<F, T>(self, f: F) -> MappedRef<'a, K, T>
@@ -37,15 +37,15 @@ impl<'a, K: Eq + Hash, V> Ref<'a, K, V> {
3737
MappedRef {
3838
_guard: self._guard,
3939
k: self.k,
40-
v: f(&*self.v),
40+
v: f(self.v),
4141
}
4242
}
4343

4444
pub fn try_map<F, T>(self, f: F) -> Result<MappedRef<'a, K, T>, Self>
4545
where
4646
F: FnOnce(&V) -> Option<&T>,
4747
{
48-
if let Some(v) = f(&*self.v) {
48+
if let Some(v) = f(self.v) {
4949
Ok(MappedRef {
5050
_guard: self._guard,
5151
k: self.k,
@@ -98,11 +98,11 @@ impl<'a, K: Eq + Hash, V> RefMut<'a, K, V> {
9898
}
9999

100100
pub fn pair(&self) -> (&K, &V) {
101-
(&*self.k, &*self.v)
101+
(self.k, self.v)
102102
}
103103

104104
pub fn pair_mut(&mut self) -> (&K, &mut V) {
105-
(&*self.k, &mut *self.v)
105+
(self.k, self.v)
106106
}
107107

108108
pub fn downgrade(self) -> Ref<'a, K, V> {
@@ -183,7 +183,7 @@ impl<'a, K: Eq + Hash, T> MappedRef<'a, K, T> {
183183
}
184184

185185
pub fn pair(&self) -> (&K, &T) {
186-
(&*self.k, &*self.v)
186+
(self.k, self.v)
187187
}
188188

189189
pub fn map<F, T2>(self, f: F) -> MappedRef<'a, K, T2>
@@ -193,15 +193,15 @@ impl<'a, K: Eq + Hash, T> MappedRef<'a, K, T> {
193193
MappedRef {
194194
_guard: self._guard,
195195
k: self.k,
196-
v: f(&*self.v),
196+
v: f(self.v),
197197
}
198198
}
199199

200200
pub fn try_map<F, T2>(self, f: F) -> Result<MappedRef<'a, K, T2>, Self>
201201
where
202202
F: FnOnce(&T) -> Option<&T2>,
203203
{
204-
let v = match f(&*self.v) {
204+
let v = match f(self.v) {
205205
Some(v) => v,
206206
None => return Err(self),
207207
};
@@ -263,11 +263,11 @@ impl<'a, K: Eq + Hash, T> MappedRefMut<'a, K, T> {
263263
}
264264

265265
pub fn pair(&self) -> (&K, &T) {
266-
(&*self.k, &*self.v)
266+
(self.k, self.v)
267267
}
268268

269269
pub fn pair_mut(&mut self) -> (&K, &mut T) {
270-
(&*self.k, &mut *self.v)
270+
(self.k, self.v)
271271
}
272272

273273
pub fn map<F, T2>(self, f: F) -> MappedRefMut<'a, K, T2>
@@ -277,7 +277,7 @@ impl<'a, K: Eq + Hash, T> MappedRefMut<'a, K, T> {
277277
MappedRefMut {
278278
_guard: self._guard,
279279
k: self.k,
280-
v: f(&mut *self.v),
280+
v: f(self.v),
281281
}
282282
}
283283

0 commit comments

Comments
 (0)