diff options
| author | bors <bors@rust-lang.org> | 2020-04-29 10:48:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-29 10:48:11 +0000 |
| commit | e91aebc1a3835b9b420da0c021e211175a724b8d (patch) | |
| tree | 92f29b71794612e46796b405356fb963bf945e60 /src/libstd | |
| parent | d9312a8db30b9eb345baf7ebaba6d92061d49096 (diff) | |
| parent | 878e92872d6398a0b15aaf855567a6ae4c6231a8 (diff) | |
| download | rust-e91aebc1a3835b9b420da0c021e211175a724b8d.tar.gz rust-e91aebc1a3835b9b420da0c021e211175a724b8d.zip | |
Auto merge of #71664 - Dylan-DPC:rollup-eng60x9, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71217 (Suggest `;` or assignment to drop borrows in tail exprs) - #71286 (Add regression test for #69654) - #71296 (Change wording on read_vectored docs) - #71654 (Update link to unstable book for llvm_asm macro) - #71657 (Add #24949 assoc constant static recursion test) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mod.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 9cfb1728c04..36c6aa620d5 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -571,8 +571,9 @@ pub trait Read { /// Like `read`, except that it reads into a slice of buffers. /// /// Data is copied to fill each buffer in order, with the final buffer - /// written to possibly being only partially filled. This method must behave - /// as a single call to `read` with the buffers concatenated would. + /// written to possibly being only partially filled. This method must + /// behave equivalently to a single call to `read` with concatenated + /// buffers. /// /// The default implementation calls `read` with either the first nonempty /// buffer provided, or an empty one if none exists. |