fixup! tonic: implement the server Connected trait for tokio UnixStream

Author: agreen17

tonic/src/transport/server/conn.rs

@@ -4,7 +4,7 @@ use tokio::net::TcpStream;
 
 #[cfg(feature = "tls")]
 use crate::transport::Certificate;
-#[cfg(any(unix, feature = "tls"))]
+#[cfg(feature = "tls")]
 use std::sync::Arc;
 #[cfg(feature = "tls")]
 use tokio_rustls::{rustls::Session, server::TlsStream};
@@ -98,42 +98,6 @@ impl Connected for TcpStream {
     }
 }
 
-/// Connection info for Unix domain socket streams.
-///
-/// This type will be accessible through [request extensions][ext] if you're using
-/// a unix stream.
-///
-/// See [`Connected`] for more details.
-///
-/// [ext]: crate::Request::extensions
-#[cfg(unix)]
-#[cfg_attr(docsrs, doc(cfg(unix)))]
-#[derive(Clone, Debug)]
-pub struct UdsConnectInfo {
-    /// Peer address. This will be "unnamed" for client unix sockets.
-    pub peer_addr: Option<Arc<tokio::net::unix::SocketAddr>>,
-    /// Process credentials for the unix socket.
-    pub peer_cred: Option<tokio::net::unix::UCred>,
-}
-
-#[cfg(unix)]
-impl Connected for tokio::net::UnixStream {
-    type ConnectInfo = UdsConnectInfo;
-
-    fn connect_info(&self) -> Self::ConnectInfo {
-        UdsConnectInfo {
-            peer_addr: self.peer_addr().ok().map(Arc::new),
-            peer_cred: self.peer_cred().ok(),
-        }
-    }
-}
-
-impl Connected for tokio::io::DuplexStream {
-    type ConnectInfo = ();
-
-    fn connect_info(&self) -> Self::ConnectInfo {}
-}
-
 #[cfg(feature = "tls")]
 impl<T> Connected for TlsStream<T>
 where

tonic/src/transport/server/mod.rs

@@ -6,6 +6,8 @@ mod recover_error;
 #[cfg(feature = "tls")]
 #[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
 mod tls;
+#[cfg(unix)]
+mod unix;
 
 pub use conn::{Connected, TcpConnectInfo};
 #[cfg(feature = "tls")]
@@ -18,7 +20,7 @@ pub use conn::TlsConnectInfo;
 use super::service::TlsAcceptor;
 
 #[cfg(unix)]
-pub use conn::UdsConnectInfo;
+pub use unix::UdsConnectInfo;
 
 use incoming::TcpIncoming;
 

tonic/src/transport/server/unix.rs

@@ -0,0 +1,37 @@
+use super::Connected;
+use std::sync::Arc;
+
+/// Connection info for Unix domain socket streams.
+///
+/// This type will be accessible through [request extensions][ext] if you're using
+/// a unix stream.
+///
+/// See [Connected] for more details.
+///
+/// [ext]: crate::Request::extensions
+/// [Connected]: crate::transport::server::Connected
+#[cfg_attr(docsrs, doc(cfg(unix)))]
+#[derive(Clone, Debug)]
+pub struct UdsConnectInfo {
+    /// Peer address. This will be "unnamed" for client unix sockets.
+    pub peer_addr: Option<Arc<tokio::net::unix::SocketAddr>>,
+    /// Process credentials for the unix socket.
+    pub peer_cred: Option<tokio::net::unix::UCred>,
+}
+
+impl Connected for tokio::net::UnixStream {
+    type ConnectInfo = UdsConnectInfo;
+
+    fn connect_info(&self) -> Self::ConnectInfo {
+        UdsConnectInfo {
+            peer_addr: self.peer_addr().ok().map(Arc::new),
+            peer_cred: self.peer_cred().ok(),
+        }
+    }
+}
+
+impl Connected for tokio::io::DuplexStream {
+    type ConnectInfo = ();
+
+    fn connect_info(&self) -> Self::ConnectInfo {}
+}