diff options
author | Artem Vorotnikov <artem@vorotnikov.me> | 2020-01-15 02:12:08 +0300 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2020-01-14 15:12:08 -0800 |
commit | bd8971cd95b2c182c16d8bfc5ee43754ee4e9c96 (patch) | |
tree | 0dca16994860cf2e411531c4944a85fe6b914060 /tokio | |
parent | eb1a8e1792b2c4b296be47a0681421c90bbdbf7a (diff) |
chore: clippy fixes (#2110)
Diffstat (limited to 'tokio')
-rw-r--r-- | tokio/src/lib.rs | 6 | ||||
-rw-r--r-- | tokio/src/process/windows.rs | 4 | ||||
-rw-r--r-- | tokio/tests/stream_fuse.rs | 2 | ||||
-rw-r--r-- | tokio/tests/sync_rwlock.rs | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs index 1b152134..bcff6b14 100644 --- a/tokio/src/lib.rs +++ b/tokio/src/lib.rs @@ -1,5 +1,9 @@ #![doc(html_root_url = "https://docs.rs/tokio/0.2.9")] -#![allow(clippy::cognitive_complexity, clippy::needless_doctest_main)] +#![allow( + clippy::cognitive_complexity, + clippy::large_enum_variant, + clippy::needless_doctest_main +)] #![warn( missing_debug_implementations, missing_docs, diff --git a/tokio/src/process/windows.rs b/tokio/src/process/windows.rs index 54330e36..cbe2fa75 100644 --- a/tokio/src/process/windows.rs +++ b/tokio/src/process/windows.rs @@ -107,11 +107,11 @@ impl Future for Child { Poll::Pending => return Poll::Pending, } let status = try_wait(&inner.child)?.expect("not ready yet"); - return Poll::Ready(Ok(status.into())); + return Poll::Ready(Ok(status)); } if let Some(e) = try_wait(&inner.child)? { - return Poll::Ready(Ok(e.into())); + return Poll::Ready(Ok(e)); } let (tx, rx) = oneshot::channel(); let ptr = Box::into_raw(Box::new(Some(tx))); diff --git a/tokio/tests/stream_fuse.rs b/tokio/tests/stream_fuse.rs index 37a52cc6..9d7d969f 100644 --- a/tokio/tests/stream_fuse.rs +++ b/tokio/tests/stream_fuse.rs @@ -13,7 +13,7 @@ impl Stream for Alternate { fn poll_next(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<i32>> { let val = self.state; - self.state = self.state + 1; + self.state += 1; // if it's even, Some(i32), else None if val % 2 == 0 { diff --git a/tokio/tests/sync_rwlock.rs b/tokio/tests/sync_rwlock.rs index b6bbf060..f4a933cb 100644 --- a/tokio/tests/sync_rwlock.rs +++ b/tokio/tests/sync_rwlock.rs @@ -103,7 +103,7 @@ fn write_read_shared_pending() { assert_ready!(t2.poll()); let mut t3 = spawn(rwlock.write()); - let mut _g2 = assert_pending!(t3.poll()); + assert_pending!(t3.poll()); let mut t4 = spawn(rwlock.read()); assert_pending!(t4.poll()); |