Prep for hyper 1: rewrap service_fn call

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/server/server.rs b/server/server.rs
index d9d63023fd085119c74035c61d1f6b175cd7766f..8dfe97d1bd1b7df63cae3900d7bcafbf3684deb8 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -257,15 +257,17 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
         move |conn: &hyper::server::conn::AddrStream| {
           let global_ = global_.clone();
           let conn = Arc::new(format!("[{}]", conn.remote_addr()));
-          async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
-            AssertUnwindSafe(
-              sweb::handle(conn.clone(), global_.clone(), req)
-            )
-              .catch_unwind()
-              .map(|r| r.unwrap_or_else(|_|{
-                crash(Err("panicked".into()), "webserver request task")
-              }))
-          }) ) }
+          async { Ok::<_, Void>(
+            hyper::service::service_fn(move |req| {
+              AssertUnwindSafe(
+                sweb::handle(conn.clone(), global_.clone(), req)
+              )
+                .catch_unwind()
+                .map(|r| r.unwrap_or_else(|_|{
+                  crash(Err("panicked".into()), "webserver request task")
+                }))
+            })
+          ) }
         }
       );