diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index cc2d79ee084..f4c164a324e 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -660,8 +660,8 @@ impl Read for File { } #[inline] - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } #[inline] @@ -680,8 +680,8 @@ impl Write for File { } #[inline] - fn can_write_vectored(&self) -> bool { - self.inner.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.inner.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { @@ -705,8 +705,8 @@ impl Read for &File { } #[inline] - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } #[inline] @@ -725,8 +725,8 @@ impl Write for &File { } #[inline] - fn can_write_vectored(&self) -> bool { - self.inner.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.inner.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index cabeaf4ae77..046b1a68880 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -292,8 +292,8 @@ impl Read for BufReader { Ok(nread) } - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } // we can't skip unconditionally because of the large buffer case in read. @@ -684,8 +684,8 @@ impl Write for BufWriter { } } - fn can_write_vectored(&self) -> bool { - self.get_ref().can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.get_ref().is_write_vectored() } fn flush(&mut self) -> io::Result<()> { diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 859431ea0ef..f3e3fc81a5d 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -266,7 +266,7 @@ where Ok(nread) } - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { true } @@ -377,7 +377,7 @@ impl Write for Cursor<&mut [u8]> { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } @@ -398,7 +398,7 @@ impl Write for Cursor<&mut Vec> { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } @@ -419,7 +419,7 @@ impl Write for Cursor> { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } @@ -442,7 +442,7 @@ impl Write for Cursor> { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs index 1fb9f12dd90..01dff0b3eb3 100644 --- a/src/libstd/io/impls.rs +++ b/src/libstd/io/impls.rs @@ -21,8 +21,8 @@ impl Read for &mut R { } #[inline] - fn can_read_vectored(&self) -> bool { - (**self).can_read_vectored() + fn is_read_vectored(&self) -> bool { + (**self).is_read_vectored() } #[inline] @@ -58,8 +58,8 @@ impl Write for &mut W { } #[inline] - fn can_write_vectored(&self) -> bool { - (**self).can_write_vectored() + fn is_write_vectored(&self) -> bool { + (**self).is_write_vectored() } #[inline] @@ -120,8 +120,8 @@ impl Read for Box { } #[inline] - fn can_read_vectored(&self) -> bool { - (**self).can_read_vectored() + fn is_read_vectored(&self) -> bool { + (**self).is_read_vectored() } #[inline] @@ -157,8 +157,8 @@ impl Write for Box { } #[inline] - fn can_write_vectored(&self) -> bool { - (**self).can_write_vectored() + fn is_write_vectored(&self) -> bool { + (**self).is_write_vectored() } #[inline] @@ -261,7 +261,7 @@ impl Read for &[u8] { } #[inline] - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { true } @@ -342,7 +342,7 @@ impl Write for &mut [u8] { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } @@ -382,7 +382,7 @@ impl Write for Vec { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index c6229fb39e0..c9db48db9bd 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -588,8 +588,8 @@ pub trait Read { /// and coalesce writes into a single buffer for higher performance. /// /// The default implementation returns `false`. - #[unstable(feature = "can_vector", issue = "none")] - fn can_read_vectored(&self) -> bool { + #[unstable(feature = "can_vector", issue = "69941")] + fn is_read_vectored(&self) -> bool { false } @@ -1325,8 +1325,8 @@ pub trait Write { /// and coalesce writes into a single buffer for higher performance. /// /// The default implementation returns `false`. - #[unstable(feature = "can_vector", issue = "none")] - fn can_write_vectored(&self) -> bool { + #[unstable(feature = "can_vector", issue = "69941")] + fn is_write_vectored(&self) -> bool { false } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index fd5a1291785..b65b150d2c3 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -88,8 +88,8 @@ impl Read for StdinRaw { } #[inline] - fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } #[inline] @@ -107,8 +107,8 @@ impl Write for StdoutRaw { } #[inline] - fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { @@ -125,8 +125,8 @@ impl Write for StderrRaw { } #[inline] - fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { @@ -156,9 +156,9 @@ impl io::Write for Maybe { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { match self { - Maybe::Real(w) => w.can_write_vectored(), + Maybe::Real(w) => w.is_write_vectored(), Maybe::Fake => true, } } @@ -187,9 +187,9 @@ impl io::Read for Maybe { } #[inline] - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { match self { - Maybe::Real(w) => w.can_read_vectored(), + Maybe::Real(w) => w.is_read_vectored(), Maybe::Fake => true, } } @@ -383,8 +383,8 @@ impl Read for Stdin { self.lock().read_vectored(bufs) } #[inline] - fn can_read_vectored(&self) -> bool { - self.lock().can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.lock().is_read_vectored() } #[inline] unsafe fn initializer(&self) -> Initializer { @@ -412,8 +412,8 @@ impl Read for StdinLock<'_> { } #[inline] - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } #[inline] @@ -584,8 +584,8 @@ impl Write for Stdout { self.lock().write_vectored(bufs) } #[inline] - fn can_write_vectored(&self) -> bool { - self.lock().can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.lock().is_write_vectored() } fn flush(&mut self) -> io::Result<()> { self.lock().flush() @@ -606,8 +606,8 @@ impl Write for StdoutLock<'_> { self.inner.borrow_mut().write_vectored(bufs) } #[inline] - fn can_write_vectored(&self) -> bool { - self.inner.borrow_mut().can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.inner.borrow_mut().is_write_vectored() } fn flush(&mut self) -> io::Result<()> { self.inner.borrow_mut().flush() @@ -758,8 +758,8 @@ impl Write for Stderr { self.lock().write_vectored(bufs) } #[inline] - fn can_write_vectored(&self) -> bool { - self.lock().can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.lock().is_write_vectored() } fn flush(&mut self) -> io::Result<()> { self.lock().flush() @@ -780,8 +780,8 @@ impl Write for StderrLock<'_> { self.inner.borrow_mut().write_vectored(bufs) } #[inline] - fn can_write_vectored(&self) -> bool { - self.inner.borrow_mut().can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.inner.borrow_mut().is_write_vectored() } fn flush(&mut self) -> io::Result<()> { self.inner.borrow_mut().flush() diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index 01947cd8b89..b9d5dc27db0 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -180,7 +180,7 @@ impl Read for Repeat { } #[inline] - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { true } @@ -241,7 +241,7 @@ impl Write for Sink { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 86955a79759..9ac54dd5f7a 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -577,8 +577,8 @@ impl Read for TcpStream { } #[inline] - fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } #[inline] @@ -597,8 +597,8 @@ impl Write for TcpStream { } #[inline] - fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { @@ -616,8 +616,8 @@ impl Read for &TcpStream { } #[inline] - fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } #[inline] @@ -636,8 +636,8 @@ impl Write for &TcpStream { } #[inline] - fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 2d22eb4ceaf..b457d190b95 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -245,8 +245,8 @@ impl Write for ChildStdin { self.inner.write_vectored(bufs) } - fn can_write_vectored(&self) -> bool { - self.inner.can_write_vectored() + fn is_write_vectored(&self) -> bool { + self.inner.is_write_vectored() } fn flush(&mut self) -> io::Result<()> { @@ -305,8 +305,8 @@ impl Read for ChildStdout { } #[inline] - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } #[inline] @@ -366,8 +366,8 @@ impl Read for ChildStderr { } #[inline] - fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } #[inline] diff --git a/src/libstd/sys/cloudabi/shims/fs.rs b/src/libstd/sys/cloudabi/shims/fs.rs index e34483447e9..9323d7d89cf 100644 --- a/src/libstd/sys/cloudabi/shims/fs.rs +++ b/src/libstd/sys/cloudabi/shims/fs.rs @@ -214,7 +214,7 @@ impl File { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/cloudabi/shims/net.rs b/src/libstd/sys/cloudabi/shims/net.rs index 22195661a2e..9d40fa1a8ea 100644 --- a/src/libstd/sys/cloudabi/shims/net.rs +++ b/src/libstd/sys/cloudabi/shims/net.rs @@ -59,7 +59,7 @@ impl TcpStream { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/cloudabi/shims/pipe.rs b/src/libstd/sys/cloudabi/shims/pipe.rs index eed8d1fdd56..b2b68a0f0ca 100644 --- a/src/libstd/sys/cloudabi/shims/pipe.rs +++ b/src/libstd/sys/cloudabi/shims/pipe.rs @@ -24,7 +24,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/hermit/fs.rs b/src/libstd/sys/hermit/fs.rs index 8d9a359f94b..82ccab1462b 100644 --- a/src/libstd/sys/hermit/fs.rs +++ b/src/libstd/sys/hermit/fs.rs @@ -302,7 +302,7 @@ impl File { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { false } @@ -315,7 +315,7 @@ impl File { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { false } diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index a8a82dba62e..5b5379c8b05 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -100,7 +100,7 @@ impl TcpStream { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -120,7 +120,7 @@ impl TcpStream { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/hermit/pipe.rs b/src/libstd/sys/hermit/pipe.rs index eed8d1fdd56..10d0925823e 100644 --- a/src/libstd/sys/hermit/pipe.rs +++ b/src/libstd/sys/hermit/pipe.rs @@ -12,7 +12,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -24,7 +24,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/hermit/stdio.rs b/src/libstd/sys/hermit/stdio.rs index ba72775e145..208265de465 100644 --- a/src/libstd/sys/hermit/stdio.rs +++ b/src/libstd/sys/hermit/stdio.rs @@ -22,7 +22,7 @@ impl Stdin { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } } @@ -57,7 +57,7 @@ impl Stdout { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } @@ -96,7 +96,7 @@ impl Stderr { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/sgx/fd.rs b/src/libstd/sys/sgx/fd.rs index 6cc7adde4d1..90158030c7f 100644 --- a/src/libstd/sys/sgx/fd.rs +++ b/src/libstd/sys/sgx/fd.rs @@ -35,7 +35,7 @@ impl FileDesc { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -48,7 +48,7 @@ impl FileDesc { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/sgx/fs.rs b/src/libstd/sys/sgx/fs.rs index e34483447e9..ecb5b51cccd 100644 --- a/src/libstd/sys/sgx/fs.rs +++ b/src/libstd/sys/sgx/fs.rs @@ -202,7 +202,7 @@ impl File { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -214,7 +214,7 @@ impl File { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/sgx/net.rs b/src/libstd/sys/sgx/net.rs index 12a9a1289df..75a48e98e73 100644 --- a/src/libstd/sys/sgx/net.rs +++ b/src/libstd/sys/sgx/net.rs @@ -150,7 +150,7 @@ impl TcpStream { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { self.inner.inner.can_read_vectored() } @@ -163,8 +163,8 @@ impl TcpStream { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.inner.inner.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.inner.inner.is_write_vectored() } pub fn peer_addr(&self) -> io::Result { diff --git a/src/libstd/sys/sgx/pipe.rs b/src/libstd/sys/sgx/pipe.rs index eed8d1fdd56..10d0925823e 100644 --- a/src/libstd/sys/sgx/pipe.rs +++ b/src/libstd/sys/sgx/pipe.rs @@ -12,7 +12,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -24,7 +24,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index 60ec73d9de2..ca1a2b5b3fb 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -656,8 +656,8 @@ impl io::Write for UnixStream { } #[inline] - fn can_write_vectored(&self) -> bool { - io::Write::can_write_vectored(&&*self) + fn is_write_vectored(&self) -> bool { + io::Write::is_write_vectored(&&*self) } fn flush(&mut self) -> io::Result<()> { @@ -676,7 +676,7 @@ impl<'a> io::Write for &'a UnixStream { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { self.0.can_write_vectored() } diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs index 7083785f426..1ef7ffacfcf 100644 --- a/src/libstd/sys/unix/fd.rs +++ b/src/libstd/sys/unix/fd.rs @@ -65,7 +65,7 @@ impl FileDesc { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -122,7 +122,7 @@ impl FileDesc { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 1e8bbd4325b..2cfc63d9492 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -829,8 +829,8 @@ impl File { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result { @@ -846,8 +846,8 @@ impl File { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result { diff --git a/src/libstd/sys/unix/l4re.rs b/src/libstd/sys/unix/l4re.rs index 8510e56af37..a2912387108 100644 --- a/src/libstd/sys/unix/l4re.rs +++ b/src/libstd/sys/unix/l4re.rs @@ -55,7 +55,7 @@ pub mod net { unimpl!(); } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { unimpl!(); } @@ -79,7 +79,7 @@ pub mod net { unimpl!(); } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { unimpl!(); } @@ -179,7 +179,7 @@ pub mod net { unimpl!(); } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { unimpl!(); } @@ -191,7 +191,7 @@ pub mod net { unimpl!(); } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { unimpl!(); } diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index ed97ddf333f..f062bc012f7 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -227,8 +227,8 @@ impl Socket { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } fn recv_from_with_flags( @@ -269,8 +269,8 @@ impl Socket { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn set_timeout(&self, dur: Option, kind: libc::c_int) -> io::Result<()> { diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index d8ac36df9ec..f2a2eabef91 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -65,8 +65,8 @@ impl AnonPipe { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } pub fn write(&self, buf: &[u8]) -> io::Result { @@ -78,8 +78,8 @@ impl AnonPipe { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn fd(&self) -> &FileDesc { diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs index 4026dd4e497..f8353214cbc 100644 --- a/src/libstd/sys/unix/stdio.rs +++ b/src/libstd/sys/unix/stdio.rs @@ -22,7 +22,7 @@ impl io::Read for Stdin { } #[inline] - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { true } } @@ -43,7 +43,7 @@ impl io::Write for Stdout { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } @@ -68,7 +68,7 @@ impl io::Write for Stderr { } #[inline] - fn can_write_vectored(&self) -> bool { + fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/vxworks/fd.rs b/src/libstd/sys/vxworks/fd.rs index 0593db65047..23e9dc428ce 100644 --- a/src/libstd/sys/vxworks/fd.rs +++ b/src/libstd/sys/vxworks/fd.rs @@ -55,7 +55,7 @@ impl FileDesc { } #[inline] - fn can_read_vectored(&self) -> bool { + fn is_read_vectored(&self) -> bool { true } @@ -105,7 +105,7 @@ impl FileDesc { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/vxworks/fs.rs b/src/libstd/sys/vxworks/fs.rs index 449431f23d9..557e65ca01b 100644 --- a/src/libstd/sys/vxworks/fs.rs +++ b/src/libstd/sys/vxworks/fs.rs @@ -352,8 +352,8 @@ impl File { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result { @@ -369,8 +369,8 @@ impl File { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result { diff --git a/src/libstd/sys/vxworks/net.rs b/src/libstd/sys/vxworks/net.rs index 455bbf3683f..de0b15b43a2 100644 --- a/src/libstd/sys/vxworks/net.rs +++ b/src/libstd/sys/vxworks/net.rs @@ -164,8 +164,8 @@ impl Socket { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } fn recv_from_with_flags( @@ -206,8 +206,8 @@ impl Socket { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn set_timeout(&self, dur: Option, kind: libc::c_int) -> io::Result<()> { diff --git a/src/libstd/sys/vxworks/pipe.rs b/src/libstd/sys/vxworks/pipe.rs index eb99eba9888..a18376212af 100644 --- a/src/libstd/sys/vxworks/pipe.rs +++ b/src/libstd/sys/vxworks/pipe.rs @@ -30,8 +30,8 @@ impl AnonPipe { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.0.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.0.is_read_vectored() } pub fn write(&self, buf: &[u8]) -> io::Result { @@ -43,8 +43,8 @@ impl AnonPipe { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.0.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.0.is_write_vectored() } pub fn fd(&self) -> &FileDesc { diff --git a/src/libstd/sys/wasi/fs.rs b/src/libstd/sys/wasi/fs.rs index eaf8d3e0ae8..793daea43c2 100644 --- a/src/libstd/sys/wasi/fs.rs +++ b/src/libstd/sys/wasi/fs.rs @@ -400,7 +400,7 @@ impl File { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -413,7 +413,7 @@ impl File { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/wasi/net.rs b/src/libstd/sys/wasi/net.rs index ac4f55f5f86..30b6b984f30 100644 --- a/src/libstd/sys/wasi/net.rs +++ b/src/libstd/sys/wasi/net.rs @@ -48,7 +48,7 @@ impl TcpStream { unsupported() } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { unsupported() } @@ -60,7 +60,7 @@ impl TcpStream { unsupported() } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { unsupported() } diff --git a/src/libstd/sys/wasi/pipe.rs b/src/libstd/sys/wasi/pipe.rs index eed8d1fdd56..10d0925823e 100644 --- a/src/libstd/sys/wasi/pipe.rs +++ b/src/libstd/sys/wasi/pipe.rs @@ -12,7 +12,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -24,7 +24,7 @@ impl AnonPipe { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/wasi/stdio.rs b/src/libstd/sys/wasi/stdio.rs index 01b041141a7..9f9e35566ec 100644 --- a/src/libstd/sys/wasi/stdio.rs +++ b/src/libstd/sys/wasi/stdio.rs @@ -20,7 +20,7 @@ impl Stdin { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -43,7 +43,7 @@ impl Stdout { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } @@ -70,7 +70,7 @@ impl Stderr { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/wasm/fs.rs b/src/libstd/sys/wasm/fs.rs index e34483447e9..ecb5b51cccd 100644 --- a/src/libstd/sys/wasm/fs.rs +++ b/src/libstd/sys/wasm/fs.rs @@ -202,7 +202,7 @@ impl File { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -214,7 +214,7 @@ impl File { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/wasm/net.rs b/src/libstd/sys/wasm/net.rs index b9c54f4612e..5c9f1098f9b 100644 --- a/src/libstd/sys/wasm/net.rs +++ b/src/libstd/sys/wasm/net.rs @@ -44,7 +44,7 @@ impl TcpStream { match self.0 {} } - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { match self.0 {} } @@ -56,7 +56,7 @@ impl TcpStream { match self.0 {} } - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { match self.0 {} } diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 70134439290..cdbfac267b9 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -410,8 +410,8 @@ impl File { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.handle.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.handle.is_read_vectored() } pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result { @@ -427,8 +427,8 @@ impl File { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.handle.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.handle.is_write_vectored() } pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result { diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs index 15a8af71d7f..2131cfc2c94 100644 --- a/src/libstd/sys/windows/handle.rs +++ b/src/libstd/sys/windows/handle.rs @@ -93,7 +93,7 @@ impl RawHandle { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { false } @@ -177,7 +177,7 @@ impl RawHandle { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { false } diff --git a/src/libstd/sys/windows/net.rs b/src/libstd/sys/windows/net.rs index 1b4411e38aa..a15ded92f08 100644 --- a/src/libstd/sys/windows/net.rs +++ b/src/libstd/sys/windows/net.rs @@ -267,7 +267,7 @@ impl Socket { } #[inline] - pub fn can_read_vectored(&self) -> bool { + pub fn is_read_vectored(&self) -> bool { true } @@ -330,7 +330,7 @@ impl Socket { } #[inline] - pub fn can_write_vectored(&self) -> bool { + pub fn is_write_vectored(&self) -> bool { true } diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index f6358cf9efd..104a8db4659 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -183,8 +183,8 @@ impl AnonPipe { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } pub fn write(&self, buf: &[u8]) -> io::Result { @@ -196,8 +196,8 @@ impl AnonPipe { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.inner.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.inner.is_write_vectored() } } diff --git a/src/libstd/sys_common/net.rs b/src/libstd/sys_common/net.rs index bfa93cb4e2c..a9b6079de75 100644 --- a/src/libstd/sys_common/net.rs +++ b/src/libstd/sys_common/net.rs @@ -266,8 +266,8 @@ impl TcpStream { } #[inline] - pub fn can_read_vectored(&self) -> bool { - self.inner.can_read_vectored() + pub fn is_read_vectored(&self) -> bool { + self.inner.is_read_vectored() } pub fn write(&self, buf: &[u8]) -> io::Result { @@ -283,8 +283,8 @@ impl TcpStream { } #[inline] - pub fn can_write_vectored(&self) -> bool { - self.inner.can_write_vectored() + pub fn is_write_vectored(&self) -> bool { + self.inner.is_write_vectored() } pub fn peer_addr(&self) -> io::Result {