diff options
| author | Steven Fackler <sfackler@gmail.com> | 2017-05-14 21:29:18 -0400 | 
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2017-06-20 20:26:22 -0700 | 
| commit | ecbb896b9eb2acadefde57be493e4298c1aa04a3 (patch) | |
| tree | f46da3b3294c60abfb2343638c79f51124ac95c0 /src/libstd/sys/unix | |
| parent | 445077963c55297ef1e196a3525723090fe80b22 (diff) | |
| download | rust-ecbb896b9eb2acadefde57be493e4298c1aa04a3.tar.gz rust-ecbb896b9eb2acadefde57be493e4298c1aa04a3.zip  | |
Add `Read::initializer`.
This is an API that allows types to indicate that they can be passed buffers of uninitialized memory which can improve performance.
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/ext/net.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fd.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/net.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/pipe.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/stdio.rs | 7 | 
6 files changed, 7 insertions, 29 deletions
diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index d688f2fa504..94b87a6bff4 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -17,7 +17,7 @@ use libc; use ascii; use ffi::OsStr; use fmt; -use io; +use io::{self, Initializer}; use mem; use net::Shutdown; use os::unix::ffi::OsStrExt; @@ -516,8 +516,9 @@ impl io::Read for UnixStream { io::Read::read(&mut &*self, buf) } - fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> { - io::Read::read_to_end(&mut &*self, buf) + #[inline] + unsafe fn initializer(&self) -> Initializer { + Initializer::nop() } } @@ -527,8 +528,9 @@ impl<'a> io::Read for &'a UnixStream { self.0.read(buf) } - fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> { - self.0.read_to_end(buf) + #[inline] + unsafe fn initializer(&self) -> Initializer { + Initializer::nop() } } diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs index 405fac2b9d7..138087f1651 100644 --- a/src/libstd/sys/unix/fd.rs +++ b/src/libstd/sys/unix/fd.rs @@ -17,7 +17,6 @@ use mem; use sync::atomic::{AtomicBool, Ordering}; use sys::cvt; use sys_common::AsInner; -use sys_common::io::read_to_end_uninitialized; #[derive(Debug)] pub struct FileDesc { @@ -232,10 +231,6 @@ impl<'a> Read for &'a FileDesc { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { (**self).read(buf) } - - fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> { - unsafe { read_to_end_uninitialized(self, buf) } - } } impl AsInner<c_int> for FileDesc { diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index e893a139094..59dceba8953 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -491,10 +491,6 @@ impl File { self.0.read(buf) } - pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> { - self.0.read_to_end(buf) - } - pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result<usize> { self.0.read_at(buf, offset) } diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 5efddca110f..8fb361a78e2 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -198,10 +198,6 @@ impl Socket { self.recv_from_with_flags(buf, MSG_PEEK) } - pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> { - self.0.read_to_end(buf) - } - pub fn write(&self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) } diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index ca5ef4bcfc5..ec9b6f17dca 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -71,10 +71,6 @@ impl AnonPipe { self.0.read(buf) } - pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> { - self.0.read_to_end(buf) - } - pub fn write(&self, buf: &[u8]) -> io::Result<usize> { self.0.write(buf) } diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs index 6d38b00b39e..7a8fe25d98e 100644 --- a/src/libstd/sys/unix/stdio.rs +++ b/src/libstd/sys/unix/stdio.rs @@ -25,13 +25,6 @@ impl Stdin { fd.into_raw(); ret } - - pub fn read_to_end(&self, buf: &mut Vec<u8>) -> io::Result<usize> { - let fd = FileDesc::new(libc::STDIN_FILENO); - let ret = fd.read_to_end(buf); - fd.into_raw(); - ret - } } impl Stdout {  | 
