From 3b5034429a5585974ed3b01d63196aa4791ef035 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 17 Nov 2022 12:05:30 +0900 Subject: [PATCH 1/4] Fix clippy::explicit_auto_deref warning ``` error: deref which would be done by auto-deref --> crossbeam-utils/src/sync/wait_group.rs:142:29 | 142 | let count: &usize = &*self.inner.count.lock().unwrap(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&self.inner.count.lock().unwrap()` | = note: `-D clippy::explicit-auto-deref` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#explicit_auto_deref ``` --- crossbeam-utils/src/sync/wait_group.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossbeam-utils/src/sync/wait_group.rs b/crossbeam-utils/src/sync/wait_group.rs index 19d607415..37e74bb06 100644 --- a/crossbeam-utils/src/sync/wait_group.rs +++ b/crossbeam-utils/src/sync/wait_group.rs @@ -139,7 +139,7 @@ impl Clone for WaitGroup { impl fmt::Debug for WaitGroup { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - let count: &usize = &*self.inner.count.lock().unwrap(); + let count: &usize = &self.inner.count.lock().unwrap(); f.debug_struct("WaitGroup").field("count", count).finish() } } From dadfc08b1b211c6adba0c099b3e3b03bb84827bd Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 17 Nov 2022 12:52:57 +0900 Subject: [PATCH 2/4] Fix clippy::needless_borrow warning ``` error: the borrowed expression implements the required traits --> crossbeam-epoch/src/internal.rs:212:17 | 212 | &|sealed_bag: &SealedBag| sealed_bag.is_expired(global_epoch), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: change this to: `(|sealed_bag: &SealedBag| sealed_bag.is_expired(global_epoch))` | = note: `-D clippy::needless-borrow` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow ``` --- crossbeam-epoch/src/internal.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossbeam-epoch/src/internal.rs b/crossbeam-epoch/src/internal.rs index a39b50033..486993c63 100644 --- a/crossbeam-epoch/src/internal.rs +++ b/crossbeam-epoch/src/internal.rs @@ -209,7 +209,7 @@ impl Global { for _ in 0..steps { match self.queue.try_pop_if( - &|sealed_bag: &SealedBag| sealed_bag.is_expired(global_epoch), + |sealed_bag: &SealedBag| sealed_bag.is_expired(global_epoch), guard, ) { None => break, From 7b934b8128a729afec8a75710846461d12ad2cd5 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 17 Nov 2022 12:53:49 +0900 Subject: [PATCH 3/4] Fix clippy::partialeq_to_none warning ``` warning: binary comparison to literal `Option::None` --> crossbeam-channel/tests/golang.rs:1050:20 | 1050 | if c.recv() != None { | ^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `c.recv().is_some()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_to_none = note: `#[warn(clippy::partialeq_to_none)]` on by default warning: binary comparison to literal `Option::None` --> crossbeam-channel/tests/golang.rs:1053:20 | 1053 | if c.try_recv() != None { | ^^^^^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `c.try_recv().is_some()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_to_none ``` --- crossbeam-channel/tests/golang.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crossbeam-channel/tests/golang.rs b/crossbeam-channel/tests/golang.rs index 41149f485..8a2761c21 100644 --- a/crossbeam-channel/tests/golang.rs +++ b/crossbeam-channel/tests/golang.rs @@ -1047,10 +1047,10 @@ mod chan_test { } } - if c.recv() != None { + if c.recv().is_some() { panic!(); } - if c.try_recv() != None { + if c.try_recv().is_some() { panic!(); } } From f76c8b38a43d3a75897a0c041d964f383c52a4f9 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 17 Nov 2022 12:56:16 +0900 Subject: [PATCH 4/4] Ignore clippy::unit_arg lint in bench ``` warning: passing a unit value to a function --> crossbeam-skiplist/benches/skiplist.rs:97:13 | 97 | black_box(map.remove(&num, guard).unwrap().release(guard)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unit_arg = note: `#[warn(clippy::unit_arg)]` on by default help: move the expression in front of the call and replace it with the unit literal `()` | 97 ~ map.remove(&num, guard).unwrap().release(guard); 98 ~ black_box(()); | ``` --- crossbeam-skiplist/benches/skiplist.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crossbeam-skiplist/benches/skiplist.rs b/crossbeam-skiplist/benches/skiplist.rs index b5d8888b8..d6760c797 100644 --- a/crossbeam-skiplist/benches/skiplist.rs +++ b/crossbeam-skiplist/benches/skiplist.rs @@ -1,4 +1,5 @@ #![feature(test)] +#![allow(clippy::unit_arg)] extern crate test;