From 50738867af00bb4553968f98c29941e75a7fa39a Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 12 Jul 2021 16:07:31 +0100
Subject: [PATCH] clippy

---
 .cargo/config.toml              | 2 +-
 actix-http/src/config.rs        | 2 ++
 src/info.rs                     | 8 ++++----
 src/server.rs                   | 3 +--
 tests/test_error_propagation.rs | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 72f445d8a..db47ca46d 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,6 +1,6 @@
 [alias]
 chk = "check --workspace --all-features --tests --examples --bins"
-lint = "clippy --workspace --tests --examples"
+lint = "clippy --workspace --all-features --tests --examples --bins"
 ci-min = "hack check --workspace --no-default-features"
 ci-min-test = "hack check --workspace --no-default-features --tests --examples"
 ci-default = "check --workspace --bins --tests --examples"
diff --git a/actix-http/src/config.rs b/actix-http/src/config.rs
index 6661e18f3..97750ff76 100644
--- a/actix-http/src/config.rs
+++ b/actix-http/src/config.rs
@@ -104,6 +104,8 @@ impl ServiceConfig {
     }
 
     /// Returns the local address that this server is bound to.
+    ///
+    /// Returns `None` for connections via UDS (Unix Domain Socket).
     #[inline]
     pub fn local_addr(&self) -> Option<net::SocketAddr> {
         self.0.local_addr
diff --git a/src/info.rs b/src/info.rs
index 54e15f987..de8ad67ee 100644
--- a/src/info.rs
+++ b/src/info.rs
@@ -65,10 +65,10 @@ fn first_header_value<'a>(req: &'a RequestHead, name: &'_ HeaderName) -> Option<
 /// [rfc7239-63]: https://datatracker.ietf.org/doc/html/rfc7239#section-6.3
 #[derive(Debug, Clone, Default)]
 pub struct ConnectionInfo {
-    scheme: String,
     host: String,
-    realip_remote_addr: Option<String>,
+    scheme: String,
     remote_addr: Option<String>,
+    realip_remote_addr: Option<String>,
 }
 
 impl ConnectionInfo {
@@ -145,9 +145,9 @@ impl ConnectionInfo {
         let remote_addr = req.peer_addr.map(|addr| addr.to_string());
 
         ConnectionInfo {
-            remote_addr,
-            scheme,
             host,
+            scheme,
+            remote_addr,
             realip_remote_addr,
         }
     }
diff --git a/src/server.rs b/src/server.rs
index b6385eef9..f15183f85 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -558,8 +558,8 @@ where
         Ok(self)
     }
 
-    #[cfg(unix)]
     /// Start listening for incoming unix domain connections.
+    #[cfg(unix)]
     pub fn bind_uds<A>(mut self, addr: A) -> io::Result<Self>
     where
         A: AsRef<std::path::Path>,
@@ -598,7 +598,6 @@ where
                         .keep_alive(c.keep_alive)
                         .client_timeout(c.client_timeout)
                         .client_disconnect(c.client_shutdown)
-                        .local_addr(socket_addr)
                         .finish(map_config(fac, move |_| config.clone())),
                 )
             },
diff --git a/tests/test_error_propagation.rs b/tests/test_error_propagation.rs
index 3e7320920..958276b62 100644
--- a/tests/test_error_propagation.rs
+++ b/tests/test_error_propagation.rs
@@ -23,7 +23,7 @@ impl std::fmt::Display for MyError {
 
 #[get("/test")]
 async fn test() -> Result<actix_web::HttpResponse, actix_web::error::Error> {
-    return Err(MyError.into());
+    Err(MyError.into())
 }
 
 #[derive(Clone)]