Refactor io::Read impl for Socket

This changes it to call Socket::recv. On unix this would previously call
read(2), but recv(2) without flags should have the same affect.

Furthermore this implements io::Read::read_vectored by calling
Socket::recv_vectored.

Author: Thomasdezeeuw

src/socket.rs

@@ -906,13 +906,21 @@ impl Socket {
 
 impl Read for Socket {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner().read(buf)
+        self.recv(buf)
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.recv_vectored(bufs).map(|(n, _)| n)
     }
 }
 
 impl<'a> Read for &'a Socket {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.inner().read(buf)
+        self.recv(buf)
+    }
+
+    fn read_vectored(&mut self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
+        self.recv_vectored(bufs).map(|(n, _)| n)
     }
 }
 

src/sys/unix.rs

@@ -7,9 +7,9 @@
 // except according to those terms.
 
 use std::cmp::min;
+use std::io::Write;
 #[cfg(not(target_os = "redox"))]
 use std::io::{IoSlice, IoSliceMut};
-use std::io::{Read, Write};
 use std::mem::{self, size_of, size_of_val, MaybeUninit};
 use std::net::Shutdown;
 use std::net::{self, Ipv4Addr, Ipv6Addr};
@@ -1027,23 +1027,6 @@ impl Socket {
     }
 }
 
-impl Read for Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        <&Socket>::read(&mut &*self, buf)
-    }
-}
-
-impl<'a> Read for &'a Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        let n = syscall!(read(
-            self.fd,
-            buf.as_mut_ptr() as *mut c_void,
-            cmp::min(buf.len(), max_len()),
-        ))?;
-        Ok(n as usize)
-    }
-}
-
 impl Write for Socket {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         <&Socket>::write(&mut &*self, buf)

src/sys/windows.rs

@@ -9,7 +9,7 @@
 use std::cmp::{self, min};
 use std::fmt;
 use std::io;
-use std::io::{IoSlice, IoSliceMut, Read, Write};
+use std::io::{IoSlice, IoSliceMut, Write};
 use std::mem::{self, size_of, size_of_val, MaybeUninit};
 use std::net::Shutdown;
 use std::net::{self, Ipv4Addr, Ipv6Addr};
@@ -884,18 +884,6 @@ impl Socket {
     }
 }
 
-impl Read for Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        <&Socket>::read(&mut &*self, buf)
-    }
-}
-
-impl<'a> Read for &'a Socket {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        recv(self.socket, buf, 0)
-    }
-}
-
 impl Write for Socket {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         <&Socket>::write(&mut &*self, buf)