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

Rename addr variable to saddr

For clarify vs caddr.

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

diff --git a/server/server.rs b/server/server.rs
index a8ac07a..6bd1944 100644
--- a/server/server.rs
+++ b/server/server.rs
@@ -251,7 +251,7 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
       }), format!("client {}", &ic)));
     }
 
-    for addr in &global.config.addrs {
+    for saddr in &global.config.addrs {
       let global_ = global.clone();
       let make_service = hyper::service::make_service_fn(
         move |conn: &hyper::server::conn::AddrStream| {
@@ -271,19 +271,19 @@ async fn async_main(opts: Opts, daemon: Option<Daemoniser>) {
         }
       );
 
-      let addr = SocketAddr::new(*addr, global.config.port);
-      let server = hyper::Server::try_bind(&addr)
+      let saddr = SocketAddr::new(*saddr, global.config.port);
+      let server = hyper::Server::try_bind(&saddr)
         .context("bind")?
         .http1_preserve_header_case(true)
         .serve(make_service);
-      info!("listening on {}", &addr);
+      info!("listening on {}", &saddr);
       let task = tokio::task::spawn(async move {
         match server.await {
           Ok(()) => anyhow!("shut down?!"),
           Err(e) => e.into(),
         }
       });
-      tasks.push((task, format!("http server {}", addr)));
+      tasks.push((task, format!("http server {}", saddr)));
     }
 
     #[allow(clippy::redundant_clone)] let global_ = global.clone();