detail

Author: kouhe3

src/net/uds/mod.rs

@@ -3,7 +3,9 @@ mod datagram;
 pub use self::datagram::UnixDatagram;
 
 mod listener;
+#[cfg(any(unix,windows))]
 pub use self::listener::UnixListener;
 
 mod stream;
+#[cfg(any(unix,windows))]
 pub use self::stream::UnixStream;

src/sys/windows/uds/listener.rs

@@ -22,7 +22,7 @@ use windows_sys::Win32::Networking::WinSock::{self, SOCKADDR_UN, SOCKET_ERROR};
 ///
 /// fn main() -> io::Result<()> {
 ///     // Bind to a socket file
-///     let listener = UnixListener::bind("C:/socket.sock")?;
+///     let listener = UnixListener::bind("/tmp/socket.sock")?;
 ///     
 ///     // Accept incoming connections
 ///     match listener.accept() {
@@ -68,7 +68,7 @@ impl UnixListener {
     /// ```no_run
     /// use mio::sys::uds::UnixListener;
     ///
-    /// let listener = UnixListener::bind("/tmp/my_socket.sock").unwrap();
+    /// let listener = UnixListener::bind("/tmp/socket.sock").unwrap();
     /// ```
     pub fn bind<P: AsRef<Path>>(path: P) -> io::Result<Self> {
         unsafe {

src/sys/windows/uds/socket.rs

@@ -208,7 +208,7 @@ impl SocketAddr {
     /// use std::path::Path;
     /// use mio::uds::SocketAddr;
     ///
-    /// let addr = SocketAddr::from_pathname("/tmp/my_socket.sock").unwrap();
+    /// let addr = SocketAddr::from_pathname("/tmp/socket.sock").unwrap();
     /// ```
     pub fn from_pathname<P: AsRef<Path>>(path: P) -> io::Result<Self> {
         let (addr, addrlen) = socketaddr_un(path.as_ref())?;

src/sys/windows/uds/stream.rs

@@ -55,7 +55,7 @@ impl UnixStream {
     /// # Examples
     ///
     /// ```no_run
-    /// let stream = UnixStream::connect("C:/my_socket")?;
+    /// let stream = UnixStream::connect("/tmp/socket.sock")?;
     /// # Ok::<(), std::io::Error>(())
     /// ```
     pub fn connect<P: AsRef<Path>>(path: P) -> io::Result<Self> {
@@ -91,7 +91,7 @@ impl UnixStream {
     /// ```no_run
     /// use mio::sys::uds::SocketAddr;
     ///
-    /// let addr = SocketAddr::from_path("C:/my_socket")?;
+    /// let addr = SocketAddr::from_path("/tmp/socket.sock")?;
     /// let stream = UnixStream::connect_addr(&addr)?;
     /// # Ok::<(), std::io::Error>(())
     /// ```

tests/unix_stream.rs

@@ -233,7 +233,7 @@ fn unix_stream_peer_addr() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -296,7 +296,7 @@ fn unix_stream_shutdown_read() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
     handle.join().unwrap();
 }
 
@@ -359,7 +359,7 @@ fn unix_stream_shutdown_write() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -430,7 +430,7 @@ fn unix_stream_shutdown_both() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -469,7 +469,7 @@ fn unix_stream_shutdown_listener_write() {
     );
 
     barrier.wait();
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -492,7 +492,7 @@ fn unix_stream_register() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -522,7 +522,7 @@ fn unix_stream_reregister() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -564,7 +564,7 @@ fn unix_stream_deregister() {
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(path).unwrap();
+    let _ = std::fs::remove_file(path);
 
     handle.join().unwrap();
 }
@@ -636,7 +636,7 @@ where
 
     // Close the connection to allow the remote to shutdown
     drop(stream);
-    std::fs::remove_file(remote_addr.as_pathname().unwrap()).unwrap();
+    let _ = std::fs::remove_file(path);
     handle.join().unwrap();
 }
 

tests/util/mod.rs

@@ -193,6 +193,10 @@ pub fn assert_error<T, E: fmt::Display>(result: Result<T, E>, expected_msg: &str
 pub fn assert_would_block<T>(result: io::Result<T>) {
     match result {
         Ok(_) => panic!("unexpected OK result, expected a `WouldBlock` error"),
+        Err(e) if e.kind() == io::ErrorKind::WouldBlock => {}
+        #[cfg(unix)]
+        Err(_) => panic!("unexpected error: {e}"),
+        #[cfg(windows)]
         Err(_) => {}
     }
 }