From 75751c45da778904785aa5c2446c909c00e1ef45 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 2 Feb 2025 13:27:43 +0000
Subject: [PATCH] Prep for hyper 1: rewrap service_fn call

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 server/server.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/server.rs b/server/server.rs
index d9d6302..8dfe97d 100644
--- 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")
+                }))
+            })
+          ) }
         }
       );
 
-- 
2.30.2