From bd8971cd95b2c182c16d8bfc5ee43754ee4e9c96 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Wed, 15 Jan 2020 02:12:08 +0300
Subject: [PATCH] chore: clippy fixes (#2110)

---
 tokio-tls/tests/smoke.rs     | 4 ++--
 tokio/src/lib.rs             | 6 +++++-
 tokio/src/process/windows.rs | 4 ++--
 tokio/tests/stream_fuse.rs   | 2 +-
 tokio/tests/sync_rwlock.rs   | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tokio-tls/tests/smoke.rs b/tokio-tls/tests/smoke.rs
index a575ba859..8788dd6d4 100644
--- a/tokio-tls/tests/smoke.rs
+++ b/tokio-tls/tests/smoke.rs
@@ -280,7 +280,7 @@ cfg_if! {
         use winapi::um::timezoneapi::*;
         use winapi::um::wincrypt::*;
 
-        const FRIENDLY_NAME: &'static str = "tokio-tls localhost testing cert";
+        const FRIENDLY_NAME: &str = "tokio-tls localhost testing cert";
 
         fn contexts() -> (tokio_tls::TlsAcceptor, tokio_tls::TlsConnector) {
             let cert = localhost_cert();
@@ -433,7 +433,7 @@ description should mention "tokio-tls".
                 let mut expiration_date: SYSTEMTIME = mem::zeroed();
                 GetSystemTime(&mut expiration_date);
                 let mut file_time: FILETIME = mem::zeroed();
-                let res = SystemTimeToFileTime(&mut expiration_date,
+                let res = SystemTimeToFileTime(&expiration_date,
                                                &mut file_time);
                 if res != TRUE {
                     return Err(Error::last_os_error());
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 1b1521348..bcff6b141 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 54330e36d..cbe2fa759 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 37a52cc64..9d7d969f8 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 b6bbf0608..f4a933cb6 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());