diff options
| author | bors <bors@rust-lang.org> | 2017-12-21 13:34:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-21 13:34:09 +0000 |
| commit | eff3de0927c36e6483ccb8a35c3d2da6e063de0b (patch) | |
| tree | cee7a79c7aa3c865552efc2838844519e14d5101 /src/libstd | |
| parent | de38f49528b537414385d42a66dda711c8c8a309 (diff) | |
| parent | bdd3f5b240bac62e6e49c12313ebf9ebbc1dfea4 (diff) | |
| download | rust-eff3de0927c36e6483ccb8a35c3d2da6e063de0b.tar.gz rust-eff3de0927c36e6483ccb8a35c3d2da6e063de0b.zip | |
Auto merge of #46904 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests - Successful merges: #46827, #46853, #46860, #46861, #46887 - Failed merges:
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 9c401d7663f..e9b707c57eb 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -441,7 +441,7 @@ fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize> /// # } /// ``` /// -/// Read from `&str` because [`&[u8]`] implements `Read`: +/// Read from [`&str`] because [`&[u8]`][slice] implements `Read`: /// /// ``` /// # use std::io; @@ -464,7 +464,8 @@ fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize> /// [`File`]: ../fs/struct.File.html /// [`BufRead`]: trait.BufRead.html /// [`BufReader`]: struct.BufReader.html -/// [`&[u8]`]: primitive.slice.html +/// [`&str`]: ../../std/primitive.str.html +/// [slice]: ../../std/primitive.slice.html #[stable(feature = "rust1", since = "1.0.0")] #[doc(spotlight)] pub trait Read { |