diff options
| author | bors <bors@rust-lang.org> | 2016-11-01 19:38:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 19:38:16 -0700 |
| commit | 3fba503bf50b4a83dbc20e002b1e1e2c00fe1054 (patch) | |
| tree | 889f76780cf9967c5d16dbcf924d7549dd38e23d /src/libstd | |
| parent | 7c69b0d5ae8c404c4847fa214126ebd7c0246277 (diff) | |
| parent | f5c192a4b7f1bb7661c1625d9ff66771a79c9e6e (diff) | |
| download | rust-3fba503bf50b4a83dbc20e002b1e1e2c00fe1054.tar.gz rust-3fba503bf50b4a83dbc20e002b1e1e2c00fe1054.zip | |
Auto merge of #37514 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 7 pull requests - Successful merges: #36849, #37059, #37296, #37316, #37484, #37485, #37495 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 4 | ||||
| -rw-r--r-- | src/libstd/io/cursor.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path.rs | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index a1909b0f957..454fa47cfbc 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -69,7 +69,9 @@ pub trait Error: Debug + Display { /// It should not contain newlines or sentence-ending punctuation, /// to facilitate embedding in larger user-facing strings. /// For showing formatted error messages with more information see - /// [Display](https://doc.rust-lang.org/std/fmt/trait.Display.html). + /// [`Display`]. + /// + /// [`Display`]: ../fmt/trait.Display.html /// /// # Examples /// diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index cb9e7bd3270..1b5023380a7 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -23,7 +23,7 @@ use io::{self, SeekFrom, Error, ErrorKind}; /// /// The standard library implements some I/O traits on various types which /// are commonly used as a buffer, like `Cursor<`[`Vec`]`<u8>>` and -/// `Cursor<`[`&[u8]`]`>`. +/// `Cursor<`[`&[u8]`][bytes]`>`. /// /// # Examples /// @@ -35,7 +35,7 @@ use io::{self, SeekFrom, Error, ErrorKind}; /// [`Read`]: ../../std/io/trait.Read.html /// [`Write`]: ../../std/io/trait.Write.html /// [`Vec`]: ../../std/vec/struct.Vec.html -/// [`&[u8]`]: ../../std/primitive.slice.html +/// [bytes]: ../../std/primitive.slice.html /// [`File`]: ../fs/struct.File.html /// /// ```no_run diff --git a/src/libstd/path.rs b/src/libstd/path.rs index a55318d3883..9b7f9980cc0 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -914,6 +914,7 @@ impl<'a> cmp::Ord for Components<'a> { /// [`Path`]: struct.Path.html /// [`push`]: struct.PathBuf.html#method.push /// [`set_extension`]: struct.PathBuf.html#method.set_extension +/// [`Deref`]: ../ops/trait.Deref.html /// /// More details about the overall approach can be found in /// the module documentation. |