chore(tonic): Refactor method to get addr

hyperium · Dec 9, 2023 · fdf0462 · fdf0462
1 parent c1443e2
commit fdf0462
Showing 1 changed file with 26 additions and 34 deletions.
diff --git a/tonic/src/request.rs b/tonic/src/request.rs
@@ -211,23 +211,19 @@ impl<T> Request<T> {
     /// This currently only works on the server side.
     #[cfg(feature = "transport")]
     pub fn local_addr(&self) -> Option<SocketAddr> {
-        #[cfg(feature = "tls")]
-        {
-            self.extensions()
-                .get::<TcpConnectInfo>()
-                .and_then(|i| i.local_addr())
-                .or_else(|| {
-                    self.extensions()
-                        .get::<TlsConnectInfo<TcpConnectInfo>>()
-                        .and_then(|i| i.get_ref().local_addr())
-                })
-        }
-
-        #[cfg(not(feature = "tls"))]
-        {
-            self.extensions()
-                .get::<TcpConnectInfo>()
-                .and_then(|i| i.local_addr())
+        let addr = self
+            .extensions()
+            .get::<TcpConnectInfo>()
+            .and_then(|i| i.local_addr());
+
+        if cfg!(feature = "tls") {
+            addr.or_else(|| {
+                self.extensions()
+                    .get::<TlsConnectInfo<TcpConnectInfo>>()
+                    .and_then(|i| i.get_ref().local_addr())
+            })
+        } else {
+            addr
         }
     }
 
@@ -238,23 +234,19 @@ impl<T> Request<T> {
     /// This currently only works on the server side.
     #[cfg(feature = "transport")]
     pub fn remote_addr(&self) -> Option<SocketAddr> {
-        #[cfg(feature = "tls")]
-        {
-            self.extensions()
-                .get::<TcpConnectInfo>()
-                .and_then(|i| i.remote_addr())
-                .or_else(|| {
-                    self.extensions()
-                        .get::<TlsConnectInfo<TcpConnectInfo>>()
-                        .and_then(|i| i.get_ref().remote_addr())
-                })
-        }
-
-        #[cfg(not(feature = "tls"))]
-        {
-            self.extensions()
-                .get::<TcpConnectInfo>()
-                .and_then(|i| i.remote_addr())
+        let addr = self
+            .extensions()
+            .get::<TcpConnectInfo>()
+            .and_then(|i| i.remote_addr());
+
+        if cfg!(feature = "tls") {
+            addr.or_else(|| {
+                self.extensions()
+                    .get::<TlsConnectInfo<TcpConnectInfo>>()
+                    .and_then(|i| i.get_ref().remote_addr())
+            })
+        } else {
+            addr
         }
     }