From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 2 Feb 2025 13:29:20 +0000 (+0000)
Subject: Rename conn variable to caddr
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5ffcf8e637164584b66ef356b1ad3ff85b807c7a;p=hippotat.git

Rename conn variable to caddr

conn is very confusing.

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

diff --git a/server/server.rs b/server/server.rs
index 8dfe97d..a8ac07a 100644
--- a/server/server.rs
+++ b/server/server.rs
@@ -256,11 +256,11 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
       let make_service = hyper::service::make_service_fn(
         move |conn: &hyper::server::conn::AddrStream| {
           let global_ = global_.clone();
-          let conn = Arc::new(format!("[{}]", conn.remote_addr()));
+          let caddr = Arc::new(format!("[{}]", conn.remote_addr()));
           async { Ok::<_, Void>(
             hyper::service::service_fn(move |req| {
               AssertUnwindSafe(
-                sweb::handle(conn.clone(), global_.clone(), req)
+                sweb::handle(caddr.clone(), global_.clone(), req)
               )
                 .catch_unwind()
                 .map(|r| r.unwrap_or_else(|_|{