diff options
| author | bors <bors@rust-lang.org> | 2020-06-03 16:06:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-03 16:06:30 +0000 |
| commit | 56daaf669ebc3d5083db5cded719f780dc31104e (patch) | |
| tree | 1c21c92c86d7d575f56c3b887e83a7ca47876321 /src/libstd | |
| parent | 6f4888845674837fd4b55adb66d9322e1973d7db (diff) | |
| parent | b61f3bb66b0b3a6646ef5435af12c6de3965b90c (diff) | |
| download | rust-56daaf669ebc3d5083db5cded719f780dc31104e.tar.gz rust-56daaf669ebc3d5083db5cded719f780dc31104e.zip | |
Auto merge of #72948 - Dylan-DPC:rollup-fazhw00, r=Dylan-DPC
Rollup of 5 pull requests
Successful merges:
- #72586 (split select into submodules)
- #72900 (Don't count pathless --extern for unused-crate-dependencies warnings)
- #72924 (Stabilize `std::io::Buf{Reader, Writer}::capacity`)
- #72942 (clean up E0641 explanation)
- #72945 (Updated documentation for Control Flow Guard)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/buffered.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 046b1a68880..e986a39eb03 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -184,7 +184,6 @@ impl<R> BufReader<R> { /// # Examples /// /// ```no_run - /// #![feature(buffered_io_capacity)] /// use std::io::{BufReader, BufRead}; /// use std::fs::File; /// @@ -198,7 +197,7 @@ impl<R> BufReader<R> { /// Ok(()) /// } /// ``` - #[unstable(feature = "buffered_io_capacity", issue = "68833")] + #[stable(feature = "buffered_io_capacity", since = "1.46.0")] pub fn capacity(&self) -> usize { self.buf.len() } @@ -609,7 +608,6 @@ impl<W: Write> BufWriter<W> { /// # Examples /// /// ```no_run - /// #![feature(buffered_io_capacity)] /// use std::io::BufWriter; /// use std::net::TcpStream; /// @@ -620,7 +618,7 @@ impl<W: Write> BufWriter<W> { /// // Calculate how many bytes can be written without flushing /// let without_flush = capacity - buf_writer.buffer().len(); /// ``` - #[unstable(feature = "buffered_io_capacity", issue = "68833")] + #[stable(feature = "buffered_io_capacity", since = "1.46.0")] pub fn capacity(&self) -> usize { self.buf.capacity() } |
