feat: implement Accept for tokio::net::UnixListener (#1135)

Author: tottoto

Cargo.toml

@@ -58,7 +58,7 @@ tracing-log = "0.2"
 serde_derive = "1.0"
 handlebars = "6.0"
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.1", features = ["net"] }
+tokio-stream = "0.1.1"
 
 [features]
 default = []
@@ -151,6 +151,10 @@ required-features = ["server"]
 name = "tracing"
 required-features = ["server"]
 
+[[example]]
+name = "unix_socket"
+required-features = ["server"]
+
 [[example]]
 name = "websockets"
 required-features = ["websocket", "server"]

examples/unix_socket.rs

@@ -1,18 +1,16 @@
-/*
 #![deny(warnings)]
 
 #[cfg(unix)]
 #[tokio::main]
 async fn main() {
     use tokio::net::UnixListener;
-    use tokio_stream::wrappers::UnixListenerStream;
 
     pretty_env_logger::init();
 
     let listener = UnixListener::bind("/tmp/warp.sock").unwrap();
-    let incoming = UnixListenerStream::new(listener);
     warp::serve(warp::fs::dir("examples/dir"))
-        .run_incoming(incoming)
+        .incoming(listener)
+        .run()
         .await;
 }
 
@@ -21,5 +19,3 @@ async fn main() {
 async fn main() {
     panic!("Must run under Unix-like platform!");
 }
-*/
-fn main() {}

src/server.rs

@@ -256,6 +256,17 @@ mod accept {
         }
     }
 
+    #[cfg(unix)]
+    impl Accept for tokio::net::UnixListener {
+        type IO = hyper_util::rt::TokioIo<tokio::net::UnixStream>;
+        type AcceptError = std::convert::Infallible;
+        type Accepting = std::future::Ready<Result<Self::IO, Self::AcceptError>>;
+        async fn accept(&mut self) -> Result<Self::Accepting, std::io::Error> {
+            let (io, _addr) = <tokio::net::UnixListener>::accept(self).await?;
+            Ok(std::future::ready(Ok(hyper_util::rt::TokioIo::new(io))))
+        }
+    }
+
     #[cfg(feature = "tls")]
     #[derive(Debug)]
     pub struct Tls<A>(pub(super) A);