]> git.lizzy.rs Git - rust.git/commitdiff
Fix SGX implementations of read/write_vectored.
authorSteven Fackler <sfackler@gmail.com>
Fri, 8 Mar 2019 02:38:49 +0000 (18:38 -0800)
committerSteven Fackler <sfackler@gmail.com>
Fri, 8 Mar 2019 02:39:18 +0000 (18:39 -0800)
src/libstd/sys/sgx/net.rs

index ab8b2681393f89a4fea26b6261e4b4f1182cacfc..cea723f6e48e12ac02612e6753562c50790623c5 100644 (file)
@@ -103,24 +103,22 @@ pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
         self.inner.inner.read(buf)
     }
 
         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(&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> {
     }
 
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {