diff options
| author | Steven Fackler <sfackler@gmail.com> | 2019-02-11 19:31:37 -0800 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2019-02-13 19:40:17 -0800 |
| commit | 596f18201c7863d8b02fe6fa1872cf3ba2b6b381 (patch) | |
| tree | 1b152d89591c590eb92bf1b18591836e88ccf347 /src/libstd/sys/sgx | |
| parent | 31bcec648aa57391115f877a2ca022d7ff6415aa (diff) | |
| download | rust-596f18201c7863d8b02fe6fa1872cf3ba2b6b381.tar.gz rust-596f18201c7863d8b02fe6fa1872cf3ba2b6b381.zip | |
impl Deref/DerefMut for IoVec types
Returning &'a mut [u8] was unsound, and we may as well just have them directly deref to their slices to make it easier to work with them.
Diffstat (limited to 'src/libstd/sys/sgx')
| -rw-r--r-- | src/libstd/sys/sgx/io.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sys/sgx/net.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/sys/sgx/io.rs b/src/libstd/sys/sgx/io.rs index 9ee5788c580..8b02d3fd19d 100644 --- a/src/libstd/sys/sgx/io.rs +++ b/src/libstd/sys/sgx/io.rs @@ -7,7 +7,7 @@ impl<'a> IoVec<'a> { } #[inline] - pub fn as_slice(&self) -> &'a [u8] { + pub fn as_slice(&self) -> &[u8] { self.0 } } @@ -21,12 +21,12 @@ impl<'a> IoVecMut<'a> { } #[inline] - pub fn as_slice(&self) -> &'a [u8] { + pub fn as_slice(&self) -> &[u8] { self.0 } #[inline] - pub fn as_mut_slice(&mut self) -> &'a mut [u8] { + pub fn as_mut_slice(&mut self) -> &mut [u8] { self.0 } } diff --git a/src/libstd/sys/sgx/net.rs b/src/libstd/sys/sgx/net.rs index 2ecae1d746f..f46ed022b21 100644 --- a/src/libstd/sys/sgx/net.rs +++ b/src/libstd/sys/sgx/net.rs @@ -105,7 +105,7 @@ impl TcpStream { pub fn read_vectored(&self, buf: &mut [IoVecMut<'_>]) -> io::Result<usize> { let buf = match buf.get(0) { - Some(buf) => buf.as_mut_slice(), + Some(buf) => buf, None => return Ok(0), }; self.read(buf) @@ -117,7 +117,7 @@ impl TcpStream { pub fn write_vectored(&self, buf: &[IoVec<'_>]) -> io::Result<usize> { let buf = match buf.get(0) { - Some(buf) => buf.as_slice(), + Some(buf) => buf, None => return Ok(0), }; self.read(buf) |
