about summary refs log tree commit diff
path: root/src/libstd/error.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-01 19:38:16 -0700
committerGitHub <noreply@github.com>2016-11-01 19:38:16 -0700
commit3fba503bf50b4a83dbc20e002b1e1e2c00fe1054 (patch)
tree889f76780cf9967c5d16dbcf924d7549dd38e23d /src/libstd/error.rs
parent7c69b0d5ae8c404c4847fa214126ebd7c0246277 (diff)
parentf5c192a4b7f1bb7661c1625d9ff66771a79c9e6e (diff)
downloadrust-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/error.rs')
-rw-r--r--src/libstd/error.rs4
1 files changed, 3 insertions, 1 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
     ///