about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-15 19:50:50 +0000
committerbors <bors@rust-lang.org>2018-10-15 19:50:50 +0000
commit46880f41b7aeb897b8245474196bba9dc11f0e88 (patch)
tree62fe4510055d0d70dc6ea315af27bf09db4dff3b /src/libstd
parent5a52983d690bfdc0d0343c1db14c2c6b2359df2d (diff)
parent562625dda21cbfbce8206c7553991eacd09e714b (diff)
downloadrust-46880f41b7aeb897b8245474196bba9dc11f0e88.tar.gz
rust-46880f41b7aeb897b8245474196bba9dc11f0e88.zip
Auto merge of #55095 - Manishearth:rollup, r=Manishearth
Rollup of 11 pull requests

Successful merges:

 - #54820 (Closes #54538: `unused_patterns` lint)
 - #54963 (Cleanup rustc/session)
 - #54991 (add test for #23189)
 - #55025 (Add missing lifetime fragment specifier to error message.)
 - #55047 (doc: make core::fmt::Error example more simple)
 - #55048 (Don't collect to vectors where unnecessary)
 - #55060 (clarify pointer add/sub function safety concerns)
 - #55062 (Make EvalContext::step public again)
 - #55066 (Fix incorrect link in println! documentation)
 - #55081 (Deduplicate tests)
 - #55088 (Update rustc documentation link)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 16a3aecfc18..34bbbb53d5f 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -139,7 +139,7 @@ macro_rules! print {
 ///
 /// [`format!`]: ../std/macro.format.html
 /// [`std::fmt`]: ../std/fmt/index.html
-/// [`eprintln!`]: ../std/macro.eprint.html
+/// [`eprintln!`]: ../std/macro.eprintln.html
 /// # Panics
 ///
 /// Panics if writing to `io::stdout` fails.