server: wip, all_clients plumbing

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

diff --git a/src/bin/server.rs b/src/bin/server.rs
index eddec3c4b2cb389d03000776ab4fd1d530de9703..92eabbdddf8170b7664679357085144cb1c49ec8 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -29,7 +29,7 @@ struct WebRequest {
 async fn handle(
   _all_clients: Arc<AllClients>,
   req: hyper::Request<hyper::Body>
-) -> Result<hyper::Response<hyper::Body>, Infallible> {
+) -> Result<hyper::Response<hyper::Body>, Void> {
   if req.method() == Method::GET {
     let mut resp = hyper::Response::new(hyper::Body::from("hippotat\r\n"));
     resp.headers_mut().insert(
@@ -158,18 +158,12 @@ async fn main() {
 
     for addr in &global.addrs {
       let all_clients_ = all_clients.clone();
-      let make_service = hyper::service::make_service_fn({
-        move |_conn| {
-          let all_clients_ = all_clients_.clone();
-          async {
-            Ok::<_, Void>(
-              hyper::service::service_fn(move |req| {
-                handle(all_clients_.clone(), req)
-              })
-            )
-          }
-        }
-      });
+      let make_service = hyper::service::make_service_fn(move |_conn| {
+        let all_clients_ = all_clients_.clone();
+        async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
+          handle(all_clients_.clone(), req)
+        }) ) } }
+      );
 
       let addr = SocketAddr::new(*addr, global.port);
       let server = hyper::Server::try_bind(&addr)