style(lib): apply latest rustfmt

ShabbirHasan1 · Feb 6, 2020 · dd02254 · dd02254
1 parent 1412077
commit dd02254
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 58 deletions.
diff --git a/benches/end_to_end.rs b/benches/end_to_end.rs
@@ -337,16 +337,12 @@ fn spawn_server(rt: &mut tokio::runtime::Runtime, opts: &Opts) -> SocketAddr {
             .http2_only(opts.http2)
             .http2_initial_stream_window_size(opts.http2_stream_window)
             .http2_initial_connection_window_size(opts.http2_conn_window)
-            .serve(make_service_fn(move |_| {
-                async move {
-                    Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| {
-                        async move {
-                            let mut req_body = req.into_body();
-                            while let Some(_chunk) = req_body.data().await {}
-                            Ok::<_, hyper::Error>(Response::new(Body::from(body)))
-                        }
-                    }))
-                }
+            .serve(make_service_fn(move |_| async move {
+                Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| async move {
+                    let mut req_body = req.into_body();
+                    while let Some(_chunk) = req_body.data().await {}
+                    Ok::<_, hyper::Error>(Response::new(Body::from(body)))
+                }))
             }))
     });
     let addr = srv.local_addr();

diff --git a/benches/pipeline.rs b/benches/pipeline.rs
@@ -25,12 +25,10 @@ fn hello_world(b: &mut test::Bencher) {
         std::thread::spawn(move || {
             let addr = "127.0.0.1:0".parse().unwrap();
 
-            let make_svc = make_service_fn(|_| {
-                async {
-                    Ok::<_, hyper::Error>(service_fn(|_| {
-                        async { Ok::<_, hyper::Error>(Response::new(Body::from("Hello, World!"))) }
-                    }))
-                }
+            let make_svc = make_service_fn(|_| async {
+                Ok::<_, hyper::Error>(service_fn(|_| async {
+                    Ok::<_, hyper::Error>(Response::new(Body::from("Hello, World!")))
+                }))
             });
 
             let mut rt = tokio::runtime::Builder::new()

diff --git a/benches/server.rs b/benches/server.rs
@@ -22,20 +22,16 @@ macro_rules! bench_server {
             let (addr_tx, addr_rx) = mpsc::channel();
             std::thread::spawn(move || {
                 let addr = "127.0.0.1:0".parse().unwrap();
-                let make_svc = make_service_fn(|_| {
-                    async {
-                        Ok::<_, hyper::Error>(service_fn(|_| {
-                            async {
-                                Ok::<_, hyper::Error>(
-                                    Response::builder()
-                                        .header($header.0, $header.1)
-                                        .header("content-type", "text/plain")
-                                        .body($body())
-                                        .unwrap(),
-                                )
-                            }
-                        }))
-                    }
+                let make_svc = make_service_fn(|_| async {
+                    Ok::<_, hyper::Error>(service_fn(|_| async {
+                        Ok::<_, hyper::Error>(
+                            Response::builder()
+                                .header($header.0, $header.1)
+                                .header("content-type", "text/plain")
+                                .body($body())
+                                .unwrap(),
+                        )
+                    }))
                 });
 
                 let mut rt = tokio::runtime::Builder::new()

diff --git a/examples/multi_server.rs b/examples/multi_server.rs
@@ -23,12 +23,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let addr1 = ([127, 0, 0, 1], 1337).into();
     let addr2 = ([127, 0, 0, 1], 1338).into();
 
-    let srv1 = Server::bind(&addr1).serve(make_service_fn(|_| {
-        async { Ok::<_, hyper::Error>(service_fn(index1)) }
+    let srv1 = Server::bind(&addr1).serve(make_service_fn(|_| async {
+        Ok::<_, hyper::Error>(service_fn(index1))
     }));
 
-    let srv2 = Server::bind(&addr2).serve(make_service_fn(|_| {
-        async { Ok::<_, hyper::Error>(service_fn(index2)) }
+    let srv2 = Server::bind(&addr2).serve(make_service_fn(|_| async {
+        Ok::<_, hyper::Error>(service_fn(index2))
     }));
 
     println!("Listening on http://{} and http://{}", addr1, addr2);

diff --git a/examples/params.rs b/examples/params.rs
@@ -81,8 +81,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 
     let addr = ([127, 0, 0, 1], 1337).into();
 
-    let server = Server::bind(&addr).serve(make_service_fn(|_| {
-        async { Ok::<_, hyper::Error>(service_fn(param_example)) }
+    let server = Server::bind(&addr).serve(make_service_fn(|_| async {
+        Ok::<_, hyper::Error>(service_fn(param_example))
     }));
 
     println!("Listening on http://{}", addr);

diff --git a/tests/client.rs b/tests/client.rs
@@ -1745,11 +1745,9 @@ mod dispatch_impl {
                 .http2_only(true)
                 .serve_connection(
                     socket,
-                    service_fn(|req| {
-                        async move {
-                            assert_eq!(req.headers().get("host"), None);
-                            Ok::<_, hyper::Error>(Response::new(Body::empty()))
-                        }
+                    service_fn(|req| async move {
+                        assert_eq!(req.headers().get("host"), None);
+                        Ok::<_, hyper::Error>(Response::new(Body::empty()))
                     }),
                 )
                 .await
@@ -2397,12 +2395,10 @@ mod conn {
 
         let server = Server::bind(&([127, 0, 0, 1], 0).into())
             .http2_only(true)
-            .serve(make_service_fn(|_| {
-                async move {
-                    Ok::<_, hyper::Error>(service_fn(|_req| {
-                        future::ok::<_, hyper::Error>(Response::new(Body::empty()))
-                    }))
-                }
+            .serve(make_service_fn(|_| async move {
+                Ok::<_, hyper::Error>(service_fn(|_req| {
+                    future::ok::<_, hyper::Error>(Response::new(Body::empty()))
+                }))
             }));
         let addr = server.local_addr();
         let (shdn_tx, shdn_rx) = oneshot::channel();

diff --git a/tests/server.rs b/tests/server.rs
@@ -1157,15 +1157,13 @@ async fn returning_1xx_response_is_error() {
     Http::new()
         .serve_connection(
             socket,
-            service_fn(|_| {
-                async move {
-                    Ok::<_, hyper::Error>(
-                        Response::builder()
-                            .status(StatusCode::CONTINUE)
-                            .body(Body::empty())
-                            .unwrap(),
-                    )
-                }
+            service_fn(|_| async move {
+                Ok::<_, hyper::Error>(
+                    Response::builder()
+                        .status(StatusCode::CONTINUE)
+                        .body(Body::empty())
+                        .unwrap(),
+                )
             }),
         )
         .await
@@ -1741,8 +1739,8 @@ async fn http2_service_poll_ready_error_sends_goaway() {
 
     let server = hyper::Server::bind(&([127, 0, 0, 1], 0).into())
         .http2_only(true)
-        .serve(make_service_fn(|_| {
-            async move { Ok::<_, BoxError>(Http2ReadyErrorSvc) }
+        .serve(make_service_fn(|_| async move {
+            Ok::<_, BoxError>(Http2ReadyErrorSvc)
         }));
 
     let addr_str = format!("http://{}", server.local_addr());