about summary refs log tree commit diff
path: root/src/libstd/error.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-04 04:15:20 -0700
committerGitHub <noreply@github.com>2016-10-04 04:15:20 -0700
commit4a9af010ebc728bc4798b1ba30de0322c1f0138a (patch)
tree3bff48d27899b511dc1a9c7993de557cb06b887b /src/libstd/error.rs
parent5ea241b9fb411b42f0173113d43ef1020ca3df70 (diff)
parent177aabdfe3c47412d8d29d9d726640a5134a6b7d (diff)
downloadrust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.tar.gz
rust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.zip
Auto merge of #36953 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests

- Successful merges: #36798, #36878, #36902, #36903, #36908, #36916, #36917, #36921, #36928, #36938, #36941, #36951
- Failed merges:
Diffstat (limited to 'src/libstd/error.rs')
-rw-r--r--src/libstd/error.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 87092b1abc9..f1f62bc24c5 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -13,9 +13,9 @@
 //! # The `Error` trait
 //!
 //! `Error` is a trait representing the basic expectations for error values,
-//! i.e. values of type `E` in `Result<T, E>`. At a minimum, errors must provide
+//! i.e. values of type `E` in [`Result<T, E>`]. At a minimum, errors must provide
 //! a description, but they may optionally provide additional detail (via
-//! `Display`) and cause chain information:
+//! [`Display`]) and cause chain information:
 //!
 //! ```
 //! use std::fmt::Display;
@@ -27,12 +27,16 @@
 //! }
 //! ```
 //!
-//! The `cause` method is generally used when errors cross "abstraction
+//! The [`cause`] method is generally used when errors cross "abstraction
 //! boundaries", i.e.  when a one module must report an error that is "caused"
 //! by an error from a lower-level module. This setup makes it possible for the
 //! high-level module to provide its own errors that do not commit to any
 //! particular implementation, but also reveal some of its implementation for
-//! debugging via `cause` chains.
+//! debugging via [`cause`] chains.
+//!
+//! [`Result<T, E>`]: ../result/enum.Result.html
+//! [`Display`]: ../fmt/trait.Display.html
+//! [`cause`]: trait.Error.html#method.cause
 
 #![stable(feature = "rust1", since = "1.0.0")]