about summary refs log tree commit diff
path: root/src/libstd/sys/redox
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-03-16 14:56:28 +0800
committerkennytm <kennytm@gmail.com>2019-03-16 22:39:15 +0800
commitd3f30c30eaf56b69cf458656c1a84a931d1108a9 (patch)
tree840b98a2652bbcc32d2e1e5bb39c5f30fb84eeb9 /src/libstd/sys/redox
parente2fdf625e9f3a1aeb3c5f1e3327140fdfc437bb7 (diff)
parentab8e1d264e6722169d25d3f52ac2e8de172e205d (diff)
downloadrust-d3f30c30eaf56b69cf458656c1a84a931d1108a9.tar.gz
rust-d3f30c30eaf56b69cf458656c1a84a931d1108a9.zip
Rollup merge of #59009 - sfackler:fix-sgx-vectors, r=alexcrichton
Fix SGX implementations of read/write_vectored.
Diffstat (limited to 'src/libstd/sys/redox')
-rw-r--r--src/libstd/sys/redox/net/tcp.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libstd/sys/redox/net/tcp.rs b/src/libstd/sys/redox/net/tcp.rs
index 5081c3de73c..3f2f6166a79 100644
--- a/src/libstd/sys/redox/net/tcp.rs
+++ b/src/libstd/sys/redox/net/tcp.rs
@@ -35,10 +35,7 @@ impl TcpStream {
     }
 
     pub fn read_vectored(&self, bufs: &mut [IoVecMut<'_>]) -> io::Result<usize> {
-        match bufs.iter_mut().find(|b| !b.is_empty()) {
-            Some(buf) => self.read(buf),
-            None => Ok(0),
-        }
+        io::default_read_vectored(|b| self.read(b), bufs)
     }
 
     pub fn write(&self, buf: &[u8]) -> Result<usize> {
@@ -46,10 +43,7 @@ impl TcpStream {
     }
 
     pub fn write_vectored(&self, bufs: &[IoVec<'_>]) -> io::Result<usize> {
-        match bufs.iter().find(|b| !b.is_empty()) {
-            Some(buf) => self.write(buf),
-            None => Ok(0),
-        }
+        io::default_write_vectored(|b| self.write(b), bufs)
     }
 
     pub fn take_error(&self) -> Result<Option<Error>> {