Simplify

Author: Stjepan Glavina

src/lib.rs

@@ -624,7 +624,7 @@ impl<T: Write> AsyncWrite for Async<T> {
     }
 
     fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Poll::Ready(self.source.shutdown_write())
+        Poll::Ready(sys::shutdown_write(self.source.raw))
     }
 }
 
@@ -653,7 +653,7 @@ where
     }
 
     fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Poll::Ready(self.source.shutdown_write())
+        Poll::Ready(sys::shutdown_write(self.source.raw))
     }
 }
 

src/parking.rs

@@ -7,12 +7,11 @@
 use std::collections::BTreeMap;
 use std::fmt;
 use std::io;
-use std::mem::{self, ManuallyDrop};
-use std::net::{Shutdown, TcpStream};
+use std::mem;
 #[cfg(unix)]
-use std::os::unix::io::{FromRawFd, RawFd};
+use std::os::unix::io::RawFd;
 #[cfg(windows)]
-use std::os::windows::io::{FromRawSocket, RawSocket};
+use std::os::windows::io::RawSocket;
 use std::panic;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Condvar, Mutex, MutexGuard};
@@ -740,21 +739,4 @@ impl Source {
         })
         .await
     }
-
-    /// Shuts down the write side of the socket.
-    ///
-    /// If this source is not a socket, the `shutdown` syscall error is ignored.
-    pub(crate) fn shutdown_write(&self) -> io::Result<()> {
-        // This may not be a TCP stream, but that's okay - all we do is call `shutdown()` on it.
-        #[cfg(unix)]
-        let stream = unsafe { ManuallyDrop::new(TcpStream::from_raw_fd(self.raw)) };
-        #[cfg(windows)]
-        let stream = unsafe { ManuallyDrop::new(TcpStream::from_raw_socket(self.raw)) };
-
-        // The only actual error may be ENOTCONN.
-        match stream.shutdown(Shutdown::Write) {
-            Err(err) if err.kind() == io::ErrorKind::NotConnected => Err(err),
-            _ => Ok(()),
-        }
-    }
 }

src/sys/mod.rs

@@ -1,3 +1,11 @@
+use std::io;
+use std::mem::ManuallyDrop;
+use std::net::{Shutdown, TcpStream};
+#[cfg(unix)]
+use std::os::unix::io::{FromRawFd, RawFd};
+#[cfg(windows)]
+use std::os::windows::io::{FromRawSocket, RawSocket};
+
 use cfg_if::cfg_if;
 
 #[cfg(unix)]
@@ -39,3 +47,24 @@ pub struct Event {
     pub writable: bool,
     pub key: usize,
 }
+
+/// Shuts down the write side of a socket.
+///
+/// If this source is not a socket, the `shutdown()` syscall error is ignored.
+pub fn shutdown_write(#[cfg(unix)] raw: RawFd, #[cfg(windows)] raw: RawSocket) -> io::Result<()> {
+    // This may not be a TCP stream, but that's okay. All we do is call `shutdown()` on the raw
+    // descriptor and ignore errors if it's not a socket.
+    let res = unsafe {
+        #[cfg(unix)]
+        let stream = ManuallyDrop::new(TcpStream::from_raw_fd(raw));
+        #[cfg(windows)]
+        let stream = ManuallyDrop::new(TcpStream::from_raw_socket(raw));
+        stream.shutdown(Shutdown::Write)
+    };
+
+    // The only actual error may be ENOTCONN, ignore everything else.
+    match res {
+        Err(err) if err.kind() == io::ErrorKind::NotConnected => Err(err),
+        _ => Ok(()),
+    }
+}