about summary refs log tree commit diff
path: root/src/libstd/sys/sgx
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/sgx
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/sgx')
-rw-r--r--src/libstd/sys/sgx/net.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/libstd/sys/sgx/net.rs b/src/libstd/sys/sgx/net.rs
index e5e42e3d0b0..e167e917957 100644
--- a/src/libstd/sys/sgx/net.rs
+++ b/src/libstd/sys/sgx/net.rs
@@ -103,24 +103,16 @@ 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> {
+        io::default_read_vectored(|b| self.read(b), bufs)
     }
 
     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> {
+        io::default_write_vectored(|b| self.write(b), bufs)
     }
 
     pub fn peer_addr(&self) -> io::Result<SocketAddr> {