about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-02 21:37:18 -0700
committerbors <bors@rust-lang.org>2016-05-02 21:37:18 -0700
commit43c5fef47dcaebea4c77771cc6f187b2a72b3639 (patch)
tree4d740e1808a7d721e17781274bd8b07632b6b433 /src/libstd
parent44b3cd8c462a420ab64a44ef8f70c007001a1f44 (diff)
parent638cf9f675174316ba5ecfaf2913c9d60da9772c (diff)
downloadrust-43c5fef47dcaebea4c77771cc6f187b2a72b3639.tar.gz
rust-43c5fef47dcaebea4c77771cc6f187b2a72b3639.zip
Auto merge of #33354 - Manishearth:rollup, r=Manishearth
Rollup of 14 pull requests

- Successful merges: #32756, #33129, #33225, #33260, #33309, #33320, #33323, #33324, #33325, #33330, #33332, #33334, #33335, #33346
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index d914d143e70..ca15aa2d56c 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -195,7 +195,7 @@
 //!
 //! ## Functions
 //!
-//! There are a number of [functions][functions] that offer access to various
+//! There are a number of [functions][functions-list] that offer access to various
 //! features. For example, we can use three of these functions to copy everything
 //! from standard input to standard output:
 //!
@@ -208,7 +208,7 @@
 //! # }
 //! ```
 //!
-//! [functions]: #functions
+//! [functions-list]: #functions-1
 //!
 //! ## io::Result
 //!