about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-14 07:24:36 +0000
committerbors <bors@rust-lang.org>2015-10-14 07:24:36 +0000
commit294ef5b158601b09e2a3ca49af124c63a9cf9528 (patch)
tree953903e5f926818305cbd3558f119e9baee5d1db /src/libstd
parent293966694c3c8e0c7028e8f54340fbc328d85bff (diff)
parent66b58d19bdeceba7aa3f4043fefd796f8c8b426c (diff)
downloadrust-294ef5b158601b09e2a3ca49af124c63a9cf9528.tar.gz
rust-294ef5b158601b09e2a3ca49af124c63a9cf9528.zip
Auto merge of #29039 - Manishearth:rollup, r=Manishearth
- Successful merges: #28991, #29004, #29006, #29013, #29016, #29024, #29027, #29028, #29029, #29032, #29035
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/error.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs
index 773f9ac6a12..6f18aad6235 100644
--- a/src/libstd/io/error.rs
+++ b/src/libstd/io/error.rs
@@ -17,9 +17,8 @@ use option::Option::{self, Some, None};
 use result;
 use sys;
 
-/// A specialized [`Result`][result] type for I/O operations.
-///
-/// [result]: ../result/enum.Result.html
+/// A specialized [`Result`](../result/enum.Result.html) type for I/O
+/// operations.
 ///
 /// This type is broadly used across `std::io` for any operation which may
 /// produce an error.