Prep for hyper 1: break out service_fn call

This will reduce the size of the eventual diff.

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

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