Apply clippy fixes, except in #[test] code

Author: bossmc

.github/workflows/CI.yml

@@ -48,6 +48,12 @@ jobs:
           command: fmt
           args: --all -- --check
 
+      - name: cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --features full --lib --examples --benches
+
   test:
     name: Test ${{ matrix.rust }} on ${{ matrix.os }}
     needs: [style]

benches/connect.rs

@@ -1,8 +1,6 @@
 #![feature(test)]
 #![deny(warnings)]
 
-extern crate test;
-
 // TODO: Reimplement http_connector bench using hyper::client::conn
 // (instead of removed HttpConnector).
 

benches/end_to_end.rs

@@ -1,8 +1,6 @@
 #![feature(test)]
 #![deny(warnings)]
 
-extern crate test;
-
 // TODO: Reimplement Opts::bench using hyper::server::conn and hyper::client::conn
 // (instead of Server and HttpClient).
 

benches/server.rs

@@ -148,7 +148,7 @@ fn raw_tcp_throughput_small_payload(b: &mut test::Bencher) {
 
         let mut buf = [0u8; 8192];
         while rx.try_recv().is_err() {
-            sock.read(&mut buf).unwrap();
+            let _ = sock.read(&mut buf).unwrap();
             sock.write_all(
                 b"\
                 HTTP/1.1 200 OK\r\n\
@@ -195,7 +195,7 @@ fn raw_tcp_throughput_large_payload(b: &mut test::Bencher) {
         let mut buf = [0u8; 8192];
         while rx.try_recv().is_err() {
             let r = sock.read(&mut buf).unwrap();
-            extern crate test;
+
             if r == 0 {
                 break;
             }

benches/support/tokiort.rs

@@ -32,13 +32,13 @@ impl Timer for TokioTimer {
     fn sleep(&self, duration: Duration) -> Box<dyn Sleep + Unpin> {
         let s = tokio::time::sleep(duration);
         let hs = TokioSleep { inner: Box::pin(s) };
-        return Box::new(hs);
+        Box::new(hs)
     }
 
     fn sleep_until(&self, deadline: Instant) -> Box<dyn Sleep + Unpin> {
-        return Box::new(TokioSleep {
+        Box::new(TokioSleep {
             inner: Box::pin(tokio::time::sleep_until(deadline.into())),
-        });
+        })
     }
 }
 

examples/gateway.rs

@@ -11,8 +11,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let in_addr: SocketAddr = ([127, 0, 0, 1], 3001).into();
     let out_addr: SocketAddr = ([127, 0, 0, 1], 3000).into();
 
-    let out_addr_clone = out_addr.clone();
-
     let listener = TcpListener::bind(in_addr).await?;
 
     println!("Listening on http://{}", in_addr);
@@ -27,7 +25,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         let service = service_fn(move |mut req| {
             let uri_string = format!(
                 "http://{}{}",
-                out_addr_clone,
+                out_addr,
                 req.uri()
                     .path_and_query()
                     .map(|x| x.as_str())

examples/http_proxy.rs

@@ -104,7 +104,7 @@ async fn proxy(req: Request<Recv>) -> Result<Response<BoxBody<Bytes, hyper::Erro
 }
 
 fn host_addr(uri: &http::Uri) -> Option<String> {
-    uri.authority().and_then(|auth| Some(auth.to_string()))
+    uri.authority().map(|auth| auth.to_string())
 }
 
 fn empty() -> BoxBody<Bytes, hyper::Error> {

examples/upgrades.rs

@@ -160,7 +160,6 @@ async fn main() {
                             res = &mut conn => {
                                 if let Err(err) = res {
                                     println!("Error serving connection: {:?}", err);
-                                    return;
                                 }
                             }
                             // Continue polling the connection after enabling graceful shutdown.
@@ -178,7 +177,7 @@ async fn main() {
     });
 
     // Client requests a HTTP connection upgrade.
-    let request = client_upgrade_request(addr.clone());
+    let request = client_upgrade_request(addr);
     if let Err(e) = request.await {
         eprintln!("client error: {}", e);
     }

examples/web_api.rs

@@ -111,7 +111,7 @@ async fn main() -> Result<()> {
         let (stream, _) = listener.accept().await?;
 
         tokio::task::spawn(async move {
-            let service = service_fn(move |req| response_examples(req));
+            let service = service_fn(response_examples);
 
             if let Err(err) = http1::Builder::new()
                 .serve_connection(stream, service)

src/body/body.rs

@@ -130,13 +130,11 @@ impl Recv {
         if !content_length.is_exact() && recv.is_end_stream() {
             content_length = DecodedLength::ZERO;
         }
-        let body = Recv::new(Kind::H2 {
+        Recv::new(Kind::H2 {
             ping,
             content_length,
             recv,
-        });
-
-        body
+        })
     }
 
     #[cfg(feature = "ffi")]
@@ -350,6 +348,7 @@ impl Sender {
 
     /// Aborts the body in an abnormal fashion.
     #[allow(unused)]
+    #[allow(clippy::redundant_clone)]
     pub(crate) fn abort(self) {
         let _ = self
             .data_tx