Refactor Socket::shutdown

Author: Thomasdezeeuw

src/socket.rs

@@ -265,7 +265,7 @@ impl Socket {
     /// This function will cause all pending and future I/O on the specified
     /// portions to return immediately with an appropriate value.
     pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        self.inner().shutdown(how)
+        sys::shutdown(self.inner, how)
     }
 
     /// Receives data on the socket from the remote address to which it is

src/sys/unix.rs

@@ -365,6 +365,15 @@ pub(crate) fn set_nonblocking(fd: SysSocket, nonblocking: bool) -> io::Result<()
     }
 }
 
+pub(crate) fn shutdown(fd: SysSocket, how: Shutdown) -> io::Result<()> {
+    let how = match how {
+        Shutdown::Write => libc::SHUT_WR,
+        Shutdown::Read => libc::SHUT_RD,
+        Shutdown::Both => libc::SHUT_RDWR,
+    };
+    syscall!(shutdown(fd, how)).map(|_| ())
+}
+
 /// Unix only API.
 impl crate::Socket {
     /// Accept a new incoming connection from this listener.
@@ -492,16 +501,6 @@ pub struct Socket {
 }
 
 impl Socket {
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        let how = match how {
-            Shutdown::Write => libc::SHUT_WR,
-            Shutdown::Read => libc::SHUT_RD,
-            Shutdown::Both => libc::SHUT_RDWR,
-        };
-        syscall!(shutdown(self.fd, how))?;
-        Ok(())
-    }
-
     pub fn recv(&self, buf: &mut [u8], flags: c_int) -> io::Result<usize> {
         let n = syscall!(recv(
             self.fd,

src/sys/windows.rs

@@ -32,14 +32,11 @@ use winapi::um::processthreadsapi::GetCurrentProcessId;
 #[cfg(feature = "all")]
 use winapi::um::winbase;
 use winapi::um::winbase::INFINITE;
-use winapi::um::winsock2::{self as sock, u_long};
+use winapi::um::winsock2::{self as sock, u_long, SD_BOTH, SD_RECEIVE, SD_SEND};
 
 use crate::{RecvFlags, SockAddr, Type};
 
 const MSG_PEEK: c_int = 0x2;
-const SD_BOTH: c_int = 2;
-const SD_RECEIVE: c_int = 0;
-const SD_SEND: c_int = 1;
 const SIO_KEEPALIVE_VALS: DWORD = 0x98000004;
 
 pub use winapi::ctypes::c_int;
@@ -266,6 +263,15 @@ pub(crate) fn set_nonblocking(socket: SysSocket, nonblocking: bool) -> io::Resul
     ioctlsocket(socket, sock::FIONBIO, &mut nonblocking)
 }
 
+pub(crate) fn shutdown(socket: SysSocket, how: Shutdown) -> io::Result<()> {
+    let how = match how {
+        Shutdown::Write => SD_SEND,
+        Shutdown::Read => SD_RECEIVE,
+        Shutdown::Both => SD_BOTH,
+    };
+    syscall!(shutdown(socket, how), PartialEq::eq, sock::SOCKET_ERROR).map(|_| ())
+}
+
 /// Caller must ensure `T` is the correct type for `opt` and `val`.
 unsafe fn getsockopt<T>(socket: SysSocket, opt: c_int, val: c_int) -> io::Result<T> {
     let mut payload: MaybeUninit<T> = MaybeUninit::uninit();
@@ -315,19 +321,6 @@ pub struct Socket {
 }
 
 impl Socket {
-    pub fn shutdown(&self, how: Shutdown) -> io::Result<()> {
-        let how = match how {
-            Shutdown::Write => SD_SEND,
-            Shutdown::Read => SD_RECEIVE,
-            Shutdown::Both => SD_BOTH,
-        };
-        if unsafe { sock::shutdown(self.socket, how) == 0 } {
-            Ok(())
-        } else {
-            Err(last_error())
-        }
-    }
-
     pub fn recv(&self, buf: &mut [u8], flags: c_int) -> io::Result<usize> {
         unsafe {
             let n = {