about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-08-20 07:09:53 -0700
committerGitHub <noreply@github.com>2016-08-20 07:09:53 -0700
commit490189634b656dcca9e41e6b52093569c03bd4df (patch)
treee437ade751764c2f56a3c9c3be904b815ad27031 /src/libstd/lib.rs
parent99867ee88380062827b63ce547603eea5fd3136c (diff)
parent9072861c2044b85c3bb8503487d5772297053cf8 (diff)
downloadrust-490189634b656dcca9e41e6b52093569c03bd4df.tar.gz
rust-490189634b656dcca9e41e6b52093569c03bd4df.zip
Auto merge of #35857 - jonathandturner:rollup, r=jonathandturner
Rollup of 19 pull requests

- Successful merges: #35234, #35701, #35709, #35710, #35775, #35778, #35780, #35781, #35794, #35800, #35804, #35806, #35811, #35812, #35818, #35827, #35830, #35831, #35839
- Failed merges: #35759
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index c05e0c3ca68..ff3b9c6d041 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -175,7 +175,7 @@
 //! [`atomic`]: sync/atomic/index.html
 //! [`collections`]: collections/index.html
 //! [`for`]: ../book/loops.html#for
-//! [`format!`]: macro.format!.html
+//! [`format!`]: macro.format.html
 //! [`fs`]: fs/index.html
 //! [`io`]: io/index.html
 //! [`iter`]: iter/index.html