From 2c00d5b3c864ab75be53dafacddd69341f9e0ec1 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 18 Jun 2021 22:25:20 +0900 Subject: [PATCH 1/3] Fix clippy::bool_assert_comparison warning --- crossbeam-channel/src/waker.rs | 2 +- crossbeam-channel/tests/after.rs | 12 +++++------ crossbeam-channel/tests/array.rs | 32 ++++++++++++++-------------- crossbeam-channel/tests/iter.rs | 4 ++-- crossbeam-channel/tests/list.rs | 24 ++++++++++----------- crossbeam-channel/tests/mpsc.rs | 4 ++-- crossbeam-channel/tests/never.rs | 4 ++-- crossbeam-channel/tests/tick.rs | 12 +++++------ crossbeam-channel/tests/zero.rs | 16 +++++++------- crossbeam-queue/tests/array_queue.rs | 16 +++++++------- crossbeam-queue/tests/seg_queue.rs | 6 +++--- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/crossbeam-channel/src/waker.rs b/crossbeam-channel/src/waker.rs index f4055bd9c..7d9f1f19e 100644 --- a/crossbeam-channel/src/waker.rs +++ b/crossbeam-channel/src/waker.rs @@ -261,7 +261,7 @@ impl SyncWaker { impl Drop for SyncWaker { #[inline] fn drop(&mut self) { - debug_assert_eq!(self.is_empty.load(Ordering::SeqCst), true); + debug_assert!(self.is_empty.load(Ordering::SeqCst)); } } diff --git a/crossbeam-channel/tests/after.rs b/crossbeam-channel/tests/after.rs index 20670dc5a..07cccb028 100644 --- a/crossbeam-channel/tests/after.rs +++ b/crossbeam-channel/tests/after.rs @@ -56,20 +56,20 @@ fn len_empty_full() { let r = after(ms(50)); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); thread::sleep(ms(100)); assert_eq!(r.len(), 1); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), true); + assert!(!r.is_empty()); + assert!(r.is_full()); r.try_recv().unwrap(); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); } #[test] diff --git a/crossbeam-channel/tests/array.rs b/crossbeam-channel/tests/array.rs index 15c30a50b..2fed17541 100644 --- a/crossbeam-channel/tests/array.rs +++ b/crossbeam-channel/tests/array.rs @@ -43,38 +43,38 @@ fn len_empty_full() { let (s, r) = bounded(2); assert_eq!(s.len(), 0); - assert_eq!(s.is_empty(), true); - assert_eq!(s.is_full(), false); + assert!(s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); s.send(()).unwrap(); assert_eq!(s.len(), 1); - assert_eq!(s.is_empty(), false); - assert_eq!(s.is_full(), false); + assert!(!s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 1); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), false); + assert!(!r.is_empty()); + assert!(!r.is_full()); s.send(()).unwrap(); assert_eq!(s.len(), 2); - assert_eq!(s.is_empty(), false); - assert_eq!(s.is_full(), true); + assert!(!s.is_empty()); + assert!(s.is_full()); assert_eq!(r.len(), 2); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), true); + assert!(!r.is_empty()); + assert!(r.is_full()); r.recv().unwrap(); assert_eq!(s.len(), 1); - assert_eq!(s.is_empty(), false); - assert_eq!(s.is_full(), false); + assert!(!s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 1); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), false); + assert!(!r.is_empty()); + assert!(!r.is_full()); } #[test] diff --git a/crossbeam-channel/tests/iter.rs b/crossbeam-channel/tests/iter.rs index 38bcac2f0..463f3b043 100644 --- a/crossbeam-channel/tests/iter.rs +++ b/crossbeam-channel/tests/iter.rs @@ -93,7 +93,7 @@ fn recv_into_iter_owned() { assert_eq!(iter.next().unwrap(), 1); assert_eq!(iter.next().unwrap(), 2); - assert_eq!(iter.next().is_none(), true); + assert!(iter.next().is_none()); } #[test] @@ -106,5 +106,5 @@ fn recv_into_iter_borrowed() { let mut iter = (&r).into_iter(); assert_eq!(iter.next().unwrap(), 1); assert_eq!(iter.next().unwrap(), 2); - assert_eq!(iter.next().is_none(), true); + assert!(iter.next().is_none()); } diff --git a/crossbeam-channel/tests/list.rs b/crossbeam-channel/tests/list.rs index f166a1981..6673e4b24 100644 --- a/crossbeam-channel/tests/list.rs +++ b/crossbeam-channel/tests/list.rs @@ -41,29 +41,29 @@ fn len_empty_full() { let (s, r) = unbounded(); assert_eq!(s.len(), 0); - assert_eq!(s.is_empty(), true); - assert_eq!(s.is_full(), false); + assert!(s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); s.send(()).unwrap(); assert_eq!(s.len(), 1); - assert_eq!(s.is_empty(), false); - assert_eq!(s.is_full(), false); + assert!(!s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 1); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), false); + assert!(!r.is_empty()); + assert!(!r.is_full()); r.recv().unwrap(); assert_eq!(s.len(), 0); - assert_eq!(s.is_empty(), true); - assert_eq!(s.is_full(), false); + assert!(s.is_empty()); + assert!(!s.is_full()); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); } #[test] diff --git a/crossbeam-channel/tests/mpsc.rs b/crossbeam-channel/tests/mpsc.rs index 2a0786a71..fc1cb2b0d 100644 --- a/crossbeam-channel/tests/mpsc.rs +++ b/crossbeam-channel/tests/mpsc.rs @@ -880,7 +880,7 @@ mod channel_tests { }; assert_eq!(iter.next().unwrap(), 1); assert_eq!(iter.next().unwrap(), 2); - assert_eq!(iter.next().is_none(), true); + assert!(iter.next().is_none()); } #[test] @@ -892,7 +892,7 @@ mod channel_tests { let mut iter = (&rx).into_iter(); assert_eq!(iter.next().unwrap(), 1); assert_eq!(iter.next().unwrap(), 2); - assert_eq!(iter.next().is_none(), true); + assert!(iter.next().is_none()); } #[test] diff --git a/crossbeam-channel/tests/never.rs b/crossbeam-channel/tests/never.rs index 31cebf67d..f275126f7 100644 --- a/crossbeam-channel/tests/never.rs +++ b/crossbeam-channel/tests/never.rs @@ -65,8 +65,8 @@ fn capacity() { fn len_empty_full() { let r = never::(); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), true); + assert!(r.is_empty()); + assert!(r.is_full()); } #[test] diff --git a/crossbeam-channel/tests/tick.rs b/crossbeam-channel/tests/tick.rs index 1273f64b5..ae59175a3 100644 --- a/crossbeam-channel/tests/tick.rs +++ b/crossbeam-channel/tests/tick.rs @@ -78,20 +78,20 @@ fn len_empty_full() { let r = tick(ms(50)); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); thread::sleep(ms(100)); assert_eq!(r.len(), 1); - assert_eq!(r.is_empty(), false); - assert_eq!(r.is_full(), true); + assert!(!r.is_empty()); + assert!(r.is_full()); r.try_recv().unwrap(); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), false); + assert!(r.is_empty()); + assert!(!r.is_full()); } #[test] diff --git a/crossbeam-channel/tests/zero.rs b/crossbeam-channel/tests/zero.rs index 1dd39e181..2adc1b244 100644 --- a/crossbeam-channel/tests/zero.rs +++ b/crossbeam-channel/tests/zero.rs @@ -35,11 +35,11 @@ fn len_empty_full() { let (s, r) = bounded(0); assert_eq!(s.len(), 0); - assert_eq!(s.is_empty(), true); - assert_eq!(s.is_full(), true); + assert!(s.is_empty()); + assert!(s.is_full()); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), true); + assert!(r.is_empty()); + assert!(r.is_full()); scope(|scope| { scope.spawn(|_| s.send(0).unwrap()); @@ -48,11 +48,11 @@ fn len_empty_full() { .unwrap(); assert_eq!(s.len(), 0); - assert_eq!(s.is_empty(), true); - assert_eq!(s.is_full(), true); + assert!(s.is_empty()); + assert!(s.is_full()); assert_eq!(r.len(), 0); - assert_eq!(r.is_empty(), true); - assert_eq!(r.is_full(), true); + assert!(r.is_empty()); + assert!(r.is_full()); } #[test] diff --git a/crossbeam-queue/tests/array_queue.rs b/crossbeam-queue/tests/array_queue.rs index 63007eb92..b2467f9a7 100644 --- a/crossbeam-queue/tests/array_queue.rs +++ b/crossbeam-queue/tests/array_queue.rs @@ -35,26 +35,26 @@ fn len_empty_full() { let q = ArrayQueue::new(2); assert_eq!(q.len(), 0); - assert_eq!(q.is_empty(), true); - assert_eq!(q.is_full(), false); + assert!(q.is_empty()); + assert!(!q.is_full()); q.push(()).unwrap(); assert_eq!(q.len(), 1); - assert_eq!(q.is_empty(), false); - assert_eq!(q.is_full(), false); + assert!(!q.is_empty()); + assert!(!q.is_full()); q.push(()).unwrap(); assert_eq!(q.len(), 2); - assert_eq!(q.is_empty(), false); - assert_eq!(q.is_full(), true); + assert!(!q.is_empty()); + assert!(q.is_full()); q.pop().unwrap(); assert_eq!(q.len(), 1); - assert_eq!(q.is_empty(), false); - assert_eq!(q.is_full(), false); + assert!(!q.is_empty()); + assert!(!q.is_full()); } #[test] diff --git a/crossbeam-queue/tests/seg_queue.rs b/crossbeam-queue/tests/seg_queue.rs index 63df9a0ab..642eb5ab1 100644 --- a/crossbeam-queue/tests/seg_queue.rs +++ b/crossbeam-queue/tests/seg_queue.rs @@ -20,17 +20,17 @@ fn len_empty_full() { let q = SegQueue::new(); assert_eq!(q.len(), 0); - assert_eq!(q.is_empty(), true); + assert!(q.is_empty()); q.push(()); assert_eq!(q.len(), 1); - assert_eq!(q.is_empty(), false); + assert!(!q.is_empty()); q.pop().unwrap(); assert_eq!(q.len(), 0); - assert_eq!(q.is_empty(), true); + assert!(q.is_empty()); } #[test] From 34619be9641d11a9b8d391e11dbbd6c746069459 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 18 Jun 2021 22:31:00 +0900 Subject: [PATCH 2/3] Fix clippy::needless_borrow warning --- crossbeam-channel/tests/after.rs | 2 +- crossbeam-channel/tests/select.rs | 32 +++++++++++++++---------------- crossbeam-epoch/src/internal.rs | 2 +- crossbeam-skiplist/src/base.rs | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/crossbeam-channel/tests/after.rs b/crossbeam-channel/tests/after.rs index 07cccb028..c6f6130d9 100644 --- a/crossbeam-channel/tests/after.rs +++ b/crossbeam-channel/tests/after.rs @@ -211,7 +211,7 @@ fn select() { break; } i => { - oper.recv(&v[i]).unwrap(); + oper.recv(v[i]).unwrap(); hits.fetch_add(1, Ordering::SeqCst); } } diff --git a/crossbeam-channel/tests/select.rs b/crossbeam-channel/tests/select.rs index fcc291ef3..dda54f059 100644 --- a/crossbeam-channel/tests/select.rs +++ b/crossbeam-channel/tests/select.rs @@ -895,12 +895,12 @@ fn matching() { for i in 0..THREADS { scope.spawn(move |_| { let mut sel = Select::new(); - let oper1 = sel.recv(&r); - let oper2 = sel.send(&s); + let oper1 = sel.recv(r); + let oper2 = sel.send(s); let oper = sel.select(); match oper.index() { - ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)), - ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()), + ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)), + ix if ix == oper2 => assert!(oper.send(s, i).is_ok()), _ => unreachable!(), } }); @@ -921,12 +921,12 @@ fn matching_with_leftover() { for i in 0..THREADS { scope.spawn(move |_| { let mut sel = Select::new(); - let oper1 = sel.recv(&r); - let oper2 = sel.send(&s); + let oper1 = sel.recv(r); + let oper2 = sel.send(s); let oper = sel.select(); match oper.index() { - ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)), - ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()), + ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)), + ix if ix == oper2 => assert!(oper.send(s, i).is_ok()), _ => unreachable!(), } }); @@ -1212,8 +1212,8 @@ fn sync_and_clone() { let (s, r) = &bounded::(0); let mut sel = Select::new(); - let oper1 = sel.recv(&r); - let oper2 = sel.send(&s); + let oper1 = sel.recv(r); + let oper2 = sel.send(s); let sel = &sel; scope(|scope| { @@ -1222,8 +1222,8 @@ fn sync_and_clone() { let mut sel = sel.clone(); let oper = sel.select(); match oper.index() { - ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)), - ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()), + ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)), + ix if ix == oper2 => assert!(oper.send(s, i).is_ok()), _ => unreachable!(), } }); @@ -1241,8 +1241,8 @@ fn send_and_clone() { let (s, r) = &bounded::(0); let mut sel = Select::new(); - let oper1 = sel.recv(&r); - let oper2 = sel.send(&s); + let oper1 = sel.recv(r); + let oper2 = sel.send(s); scope(|scope| { for i in 0..THREADS { @@ -1250,8 +1250,8 @@ fn send_and_clone() { scope.spawn(move |_| { let oper = sel.select(); match oper.index() { - ix if ix == oper1 => assert_ne!(oper.recv(&r), Ok(i)), - ix if ix == oper2 => assert!(oper.send(&s, i).is_ok()), + ix if ix == oper1 => assert_ne!(oper.recv(r), Ok(i)), + ix if ix == oper2 => assert!(oper.send(s, i).is_ok()), _ => unreachable!(), } }); diff --git a/crossbeam-epoch/src/internal.rs b/crossbeam-epoch/src/internal.rs index 966bceb2e..0b778bd0f 100644 --- a/crossbeam-epoch/src/internal.rs +++ b/crossbeam-epoch/src/internal.rs @@ -311,7 +311,7 @@ impl Global { // TODO(stjepang): `Local`s are stored in a linked list because linked lists are fairly // easy to implement in a lock-free manner. However, traversal can be slow due to cache // misses and data dependencies. We should experiment with other data structures as well. - for local in self.locals.iter(&guard) { + for local in self.locals.iter(guard) { match local { Err(IterError::Stalled) => { // A concurrent thread stalled this iteration. That thread might also try to diff --git a/crossbeam-skiplist/src/base.rs b/crossbeam-skiplist/src/base.rs index 0e61ca100..862a1ae3d 100644 --- a/crossbeam-skiplist/src/base.rs +++ b/crossbeam-skiplist/src/base.rs @@ -1797,7 +1797,7 @@ where self.tail = match self.tail { Some(n) => self .parent - .search_bound(Bound::Excluded(&n.key.borrow()), true, self.guard), + .search_bound(Bound::Excluded(n.key.borrow()), true, self.guard), None => self .parent .search_bound(self.range.end_bound(), true, self.guard), From 9ecf25332f835b9e8c9410188e32ecc385a8ec98 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 18 Jun 2021 22:31:54 +0900 Subject: [PATCH 3/3] Fix clippy::identity_op warning --- crossbeam-skiplist/tests/map.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossbeam-skiplist/tests/map.rs b/crossbeam-skiplist/tests/map.rs index 630e7acce..06a0567e0 100644 --- a/crossbeam-skiplist/tests/map.rs +++ b/crossbeam-skiplist/tests/map.rs @@ -198,7 +198,7 @@ fn len() { assert_eq!(s.len(), 0); for (i, &x) in [4, 2, 12, 8, 7, 11, 5].iter().enumerate() { - s.insert(x, x * 1); + s.insert(x, x * 10); assert_eq!(s.len(), i + 1); }