diff options
| author | bors <bors@rust-lang.org> | 2019-11-08 04:44:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-08 04:44:23 +0000 |
| commit | c34472b77084c9f76f872871aeab121daf81fb99 (patch) | |
| tree | ed6d5a1b7638907fcdcccb01d3a949aace342b41 /src/libstd/io/buffered.rs | |
| parent | d2574403b31508be9cfed468e352467043d2354d (diff) | |
| parent | 1969f415fae4b4fc107d0363c998c13ea44ef548 (diff) | |
| download | rust-c34472b77084c9f76f872871aeab121daf81fb99.tar.gz rust-c34472b77084c9f76f872871aeab121daf81fb99.zip | |
Auto merge of #66208 - JohnTitor:rollup-2umgjer, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #65554 (Enhance the documentation of BufReader for potential data loss) - #65580 (Add `MaybeUninit` methods `uninit_array`, `slice_get_ref`, `slice_get_mut`) - #66049 (consistent handling of missing sysroot spans) - #66056 (rustc_metadata: Some reorganization of the module structure) - #66123 (No more hidden elements) - #66157 (Improve math log documentation examples) - #66165 (Ignore these tests ,since the called commands doesn't exist in VxWorks) - #66190 (rustc_target: inline abi::FloatTy into abi::Primitive.) Failed merges: - #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`) r? @ghost
Diffstat (limited to 'src/libstd/io/buffered.rs')
| -rw-r--r-- | src/libstd/io/buffered.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 9593a1bae0a..ad567c97c2c 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -24,7 +24,9 @@ use crate::memchr; /// /// When the `BufReader<R>` is dropped, the contents of its buffer will be /// discarded. Creating multiple instances of a `BufReader<R>` on the same -/// stream can cause data loss. +/// stream can cause data loss. Reading from the underlying reader after +/// unwrapping the `BufReader<R>` with `BufReader::into_inner` can also cause +/// data loss. /// /// [`Read`]: ../../std/io/trait.Read.html /// [`TcpStream::read`]: ../../std/net/struct.TcpStream.html#method.read @@ -179,7 +181,8 @@ impl<R> BufReader<R> { /// Unwraps this `BufReader<R>`, returning the underlying reader. /// - /// Note that any leftover data in the internal buffer is lost. + /// Note that any leftover data in the internal buffer is lost. Therefore, + /// a following read from the underlying reader may lead to data loss. /// /// # Examples /// |
