Skip to content

Commit 90a3dd5

Browse files
committed
fix clippy lints
1 parent 6d9b220 commit 90a3dd5

11 files changed

Lines changed: 83 additions & 89 deletions

File tree

src/async.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl<'a, T> Deref for OwnedOrRef<'a, T> {
7777

7878
fn deref(&self) -> &T {
7979
match self {
80-
OwnedOrRef::Owned(arc) => &arc,
80+
OwnedOrRef::Owned(arc) => arc,
8181
OwnedOrRef::Ref(r) => r,
8282
}
8383
}
@@ -90,9 +90,9 @@ impl<T> Sender<T> {
9090
///
9191
/// In the current implementation, the returned future will not yield to the async runtime if the
9292
/// channel is unbounded. This may change in later versions.
93-
pub fn send_async(&self, item: T) -> SendFut<T> {
93+
pub fn send_async(&self, item: T) -> SendFut<'_, T> {
9494
SendFut {
95-
sender: OwnedOrRef::Ref(&self),
95+
sender: OwnedOrRef::Ref(self),
9696
hook: Some(SendState::NotYetSent(item)),
9797
}
9898
}
@@ -117,7 +117,7 @@ impl<T> Sender<T> {
117117
/// channel is unbounded. This may change in later versions.
118118
pub fn sink(&self) -> SendSink<'_, T> {
119119
SendSink(SendFut {
120-
sender: OwnedOrRef::Ref(&self),
120+
sender: OwnedOrRef::Ref(self),
121121
hook: None,
122122
})
123123
}

src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ impl<T> Hook<T, SyncSignal> {
400400

401401
#[cfg(feature = "spin")]
402402
#[inline]
403-
fn wait_lock<T>(lock: &Spinlock<T>) -> SpinlockGuard<T> {
403+
fn wait_lock<T>(lock: &Spinlock<T>) -> SpinlockGuard<'_, T> {
404404
// Some targets don't support `thread::sleep` (e.g. the `wasm32-unknown-unknown` target when
405405
// running in the main thread of a web browser) so we only use it on targets where we know it
406406
// will work
@@ -975,20 +975,20 @@ impl<T> Receiver<T> {
975975
/// when all senders have been dropped.
976976
///
977977
/// You can also create a self-owned iterator with [`Receiver::into_iter`].
978-
pub fn iter(&self) -> Iter<T> {
979-
Iter { receiver: &self }
978+
pub fn iter(&self) -> Iter<'_, T> {
979+
Iter { receiver: self }
980980
}
981981

982982
/// A non-blocking iterator over the values received on the channel that finishes iteration
983983
/// when all senders have been dropped or the channel is empty.
984-
pub fn try_iter(&self) -> TryIter<T> {
985-
TryIter { receiver: &self }
984+
pub fn try_iter(&self) -> TryIter<'_, T> {
985+
TryIter { receiver: self }
986986
}
987987

988988
/// Take all msgs currently sitting in the channel and produce an iterator over them. Unlike
989989
/// `try_iter`, the iterator will not attempt to fetch any more values from the channel once
990990
/// the function has been called.
991-
pub fn drain(&self) -> Drain<T> {
991+
pub fn drain(&self) -> Drain<'_, T> {
992992
let mut chan = wait_lock(&self.shared.chan);
993993
chan.pull_pending(false);
994994
let queue = std::mem::take(&mut chan.queue);

src/select.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'a, T> Selector<'a, T> {
101101
selections: Vec::new(),
102102
next_poll: 0,
103103
signalled: Arc::default(),
104-
phantom: PhantomData::default(),
104+
phantom: PhantomData,
105105
#[cfg(feature = "eventual-fairness")]
106106
rng: fastrand::Rng::new(),
107107
}
@@ -180,7 +180,7 @@ impl<'a, T> Selector<'a, T> {
180180
return None;
181181
};
182182

183-
Some((&mut self.mapper)(res))
183+
Some((self.mapper)(res))
184184
}
185185

186186
fn deinit(&mut self) {
@@ -274,7 +274,7 @@ impl<'a, T> Selector<'a, T> {
274274
return None;
275275
};
276276

277-
Some((&mut self.mapper)(res))
277+
Some((self.mapper)(res))
278278
}
279279

280280
fn deinit(&mut self) {
@@ -320,7 +320,7 @@ impl<'a, T> Selector<'a, T> {
320320
self.next_poll = self.rng.usize(0..self.selections.len());
321321
}
322322

323-
let res = 'outer: loop {
323+
let res = 'outer: {
324324
// Init signals
325325
for _ in 0..self.selections.len() {
326326
if let Some(val) = self.selections[self.next_poll].init() {

tests/array.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::time::Duration;
1111

1212
use crossbeam_utils::thread::scope;
1313
use flume::{bounded, Receiver};
14-
use flume::{RecvError, RecvTimeoutError, TryRecvError};
14+
use flume::{RecvTimeoutError, TryRecvError};
1515
use flume::{SendError, SendTimeoutError, TrySendError};
1616
use rand::{thread_rng, Rng};
1717

@@ -46,38 +46,38 @@ fn len_empty_full() {
4646
let (s, r) = bounded(2);
4747

4848
assert_eq!(s.len(), 0);
49-
assert_eq!(s.is_empty(), true);
50-
assert_eq!(s.is_full(), false);
49+
assert!(s.is_empty());
50+
assert!(!s.is_full());
5151
assert_eq!(r.len(), 0);
52-
assert_eq!(r.is_empty(), true);
53-
assert_eq!(r.is_full(), false);
52+
assert!(r.is_empty());
53+
assert!(!r.is_full());
5454

5555
s.send(()).unwrap();
5656

5757
assert_eq!(s.len(), 1);
58-
assert_eq!(s.is_empty(), false);
59-
assert_eq!(s.is_full(), false);
58+
assert!(!s.is_empty());
59+
assert!(!s.is_full());
6060
assert_eq!(r.len(), 1);
61-
assert_eq!(r.is_empty(), false);
62-
assert_eq!(r.is_full(), false);
61+
assert!(!r.is_empty());
62+
assert!(!r.is_full());
6363

6464
s.send(()).unwrap();
6565

6666
assert_eq!(s.len(), 2);
67-
assert_eq!(s.is_empty(), false);
68-
assert_eq!(s.is_full(), true);
67+
assert!(!s.is_empty());
68+
assert!(s.is_full());
6969
assert_eq!(r.len(), 2);
70-
assert_eq!(r.is_empty(), false);
71-
assert_eq!(r.is_full(), true);
70+
assert!(!r.is_empty());
71+
assert!(r.is_full());
7272

7373
r.recv().unwrap();
7474

7575
assert_eq!(s.len(), 1);
76-
assert_eq!(s.is_empty(), false);
77-
assert_eq!(s.is_full(), false);
76+
assert!(!s.is_empty());
77+
assert!(!s.is_full());
7878
assert_eq!(r.len(), 1);
79-
assert_eq!(r.is_empty(), false);
80-
assert_eq!(r.is_full(), false);
79+
assert!(!r.is_empty());
80+
assert!(!r.is_full());
8181
}
8282

8383
#[test]

tests/async.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ fn change_waker() {
197197
self.0.load(Ordering::SeqCst)
198198
}
199199

200-
fn ctx(&self) -> Context {
200+
fn ctx(&self) -> Context<'_> {
201201
Context::from_waker(&self.1)
202202
}
203203
}

tests/basic.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ fn hydra() {
277277
for _ in 0..10 {
278278
for tx in &txs {
279279
for _ in 0..msg_num {
280-
tx.send(Default::default()).unwrap();
280+
tx.send(()).unwrap();
281281
}
282282
}
283283

@@ -314,7 +314,7 @@ fn robin() {
314314
let main_tx = main_tx.clone();
315315
std::thread::spawn(move || {
316316
for _ in 0..msg_num {
317-
main_tx.send(Default::default()).unwrap();
317+
main_tx.send(()).unwrap();
318318
}
319319
});
320320

@@ -365,7 +365,7 @@ fn select_general() {
365365
t.join().unwrap();
366366
}
367367

368-
struct MessageWithoutDebug(u32);
368+
struct MessageWithoutDebug;
369369

370370
#[test]
371371
// This is a 'does it build' test, to make sure that the error types can turn
@@ -374,7 +374,7 @@ struct MessageWithoutDebug(u32);
374374
fn std_error_without_debug() {
375375
let (tx, rx) = unbounded::<MessageWithoutDebug>();
376376

377-
match tx.send(MessageWithoutDebug(1)) {
377+
match tx.send(MessageWithoutDebug) {
378378
Ok(_) => {}
379379
Err(e) => {
380380
let _std_err: &dyn std::error::Error = &e;
@@ -388,7 +388,7 @@ fn std_error_without_debug() {
388388
}
389389
}
390390

391-
match tx.try_send(MessageWithoutDebug(2)) {
391+
match tx.try_send(MessageWithoutDebug) {
392392
Ok(_) => {}
393393
Err(e) => {
394394
let _std_err: &dyn std::error::Error = &e;
@@ -402,7 +402,7 @@ fn std_error_without_debug() {
402402
}
403403
}
404404

405-
match tx.send_timeout(MessageWithoutDebug(3), Duration::from_secs(1000000)) {
405+
match tx.send_timeout(MessageWithoutDebug, Duration::from_secs(1000000)) {
406406
Ok(_) => {}
407407
Err(e) => {
408408
let _std_err: &dyn std::error::Error = &e;

tests/iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn recv_into_iter_owned() {
9595

9696
assert_eq!(iter.next().unwrap(), 1);
9797
assert_eq!(iter.next().unwrap(), 2);
98-
assert_eq!(iter.next().is_none(), true);
98+
assert!(iter.next().is_none());
9999
}
100100

101101
#[test]
@@ -108,5 +108,5 @@ fn recv_into_iter_borrowed() {
108108
let mut iter = (&r).into_iter();
109109
assert_eq!(iter.next().unwrap(), 1);
110110
assert_eq!(iter.next().unwrap(), 2);
111-
assert_eq!(iter.next().is_none(), true);
111+
assert!(iter.next().is_none());
112112
}

tests/list.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::time::Duration;
1111

1212
use crossbeam_utils::thread::scope;
1313
use flume::{unbounded, Receiver};
14-
use flume::{RecvError, RecvTimeoutError, TryRecvError};
14+
use flume::{RecvTimeoutError, TryRecvError};
1515
use flume::{SendError, SendTimeoutError, TrySendError};
1616
use rand::{thread_rng, Rng};
1717

@@ -44,29 +44,29 @@ fn len_empty_full() {
4444
let (s, r) = unbounded();
4545

4646
assert_eq!(s.len(), 0);
47-
assert_eq!(s.is_empty(), true);
48-
assert_eq!(s.is_full(), false);
47+
assert!(s.is_empty());
48+
assert!(!s.is_full());
4949
assert_eq!(r.len(), 0);
50-
assert_eq!(r.is_empty(), true);
51-
assert_eq!(r.is_full(), false);
50+
assert!(r.is_empty());
51+
assert!(!r.is_full());
5252

5353
s.send(()).unwrap();
5454

5555
assert_eq!(s.len(), 1);
56-
assert_eq!(s.is_empty(), false);
57-
assert_eq!(s.is_full(), false);
56+
assert!(!s.is_empty());
57+
assert!(!s.is_full());
5858
assert_eq!(r.len(), 1);
59-
assert_eq!(r.is_empty(), false);
60-
assert_eq!(r.is_full(), false);
59+
assert!(!r.is_empty());
60+
assert!(!r.is_full());
6161

6262
r.recv().unwrap();
6363

6464
assert_eq!(s.len(), 0);
65-
assert_eq!(s.is_empty(), true);
66-
assert_eq!(s.is_full(), false);
65+
assert!(s.is_empty());
66+
assert!(!s.is_full());
6767
assert_eq!(r.len(), 0);
68-
assert_eq!(r.is_empty(), true);
69-
assert_eq!(r.is_full(), false);
68+
assert!(r.is_empty());
69+
assert!(!r.is_full());
7070
}
7171

7272
#[test]

0 commit comments

Comments
 (0)