Skip to content

Commit

Permalink
Merge #714
Browse files Browse the repository at this point in the history
714: Fix newly added clippy warnings r=taiki-e a=taiki-e

Addresses the newly added clippy warnings.

Co-authored-by: Taiki Endo <[email protected]>
  • Loading branch information
bors[bot] and taiki-e authored Jun 18, 2021
2 parents 8d187a3 + 9ecf253 commit 5ee501f
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion crossbeam-channel/src/waker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
14 changes: 7 additions & 7 deletions crossbeam-channel/tests/after.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -211,7 +211,7 @@ fn select() {
break;
}
i => {
oper.recv(&v[i]).unwrap();
oper.recv(v[i]).unwrap();
hits.fetch_add(1, Ordering::SeqCst);
}
}
Expand Down
32 changes: 16 additions & 16 deletions crossbeam-channel/tests/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-channel/tests/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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());
}
24 changes: 12 additions & 12 deletions crossbeam-channel/tests/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-channel/tests/mpsc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-channel/tests/never.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ fn capacity() {
fn len_empty_full() {
let r = never::<i32>();
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]
Expand Down
32 changes: 16 additions & 16 deletions crossbeam-channel/tests/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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!(),
}
});
Expand All @@ -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!(),
}
});
Expand Down Expand Up @@ -1212,8 +1212,8 @@ fn sync_and_clone() {
let (s, r) = &bounded::<usize>(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| {
Expand All @@ -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!(),
}
});
Expand All @@ -1241,17 +1241,17 @@ fn send_and_clone() {
let (s, r) = &bounded::<usize>(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 {
let mut sel = sel.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!(),
}
});
Expand Down
12 changes: 6 additions & 6 deletions crossbeam-channel/tests/tick.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
16 changes: 8 additions & 8 deletions crossbeam-channel/tests/zero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/src/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions crossbeam-queue/tests/array_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions crossbeam-queue/tests/seg_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-skiplist/src/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading

0 comments on commit 5ee501f

Please sign in to comment.