about summary refs log tree commit diff
path: root/src/libstd/sys/sgx
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2019-03-07 18:38:49 -0800
committerSteven Fackler <sfackler@gmail.com>2019-03-07 18:39:18 -0800
commitec91f26442aaf51ececcb054f5a4b92f7f5c0615 (patch)
tree59b61e0b7e2f56593a7e7364b2a46d1a02c0bead /src/libstd/sys/sgx
parent88f755f8a84df1d9e6b17cf10c96ae8b93481b2e (diff)
downloadrust-ec91f26442aaf51ececcb054f5a4b92f7f5c0615.tar.gz
rust-ec91f26442aaf51ececcb054f5a4b92f7f5c0615.zip
Fix SGX implementations of read/write_vectored.
Diffstat (limited to 'src/libstd/sys/sgx')
-rw-r--r--src/libstd/sys/sgx/net.rs22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/libstd/sys/sgx/net.rs b/src/libstd/sys/sgx/net.rs
index ab8b2681393..cea723f6e48 100644
--- a/src/libstd/sys/sgx/net.rs
+++ b/src/libstd/sys/sgx/net.rs
@@ -103,24 +103,22 @@ impl TcpStream {
         self.inner.inner.read(buf)
     }
 
-    pub fn read_vectored(&self, buf: &mut [IoVecMut<'_>]) -> io::Result<usize> {
-        let buf = match buf.get_mut(0) {
-            Some(buf) => buf,
-            None => return Ok(0),
-        };
-        self.read(buf)
+    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),
+        }
     }
 
     pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
         self.inner.inner.write(buf)
     }
 
-    pub fn write_vectored(&self, buf: &[IoVec<'_>]) -> io::Result<usize> {
-        let buf = match buf.get(0) {
-            Some(buf) => buf,
-            None => return Ok(0),
-        };
-        self.write(buf)
+    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),
+        }
     }
 
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {