diff options
| author | bors <bors@rust-lang.org> | 2016-08-20 07:09:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 07:09:53 -0700 |
| commit | 490189634b656dcca9e41e6b52093569c03bd4df (patch) | |
| tree | e437ade751764c2f56a3c9c3be904b815ad27031 /src/libstd/io | |
| parent | 99867ee88380062827b63ce547603eea5fd3136c (diff) | |
| parent | 9072861c2044b85c3bb8503487d5772297053cf8 (diff) | |
| download | rust-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/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 88fd4186e0a..307d014fd68 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -236,7 +236,7 @@ //! to read the line and print it, so we use `()`. //! //! [result]: type.Result.html -//! [try]: ../macro.try!.html +//! [try]: ../macro.try.html //! //! ## Platform-specific behavior //! @@ -957,8 +957,8 @@ pub trait Write { /// explicitly be called. The [`write!`][write] macro should be favored to /// invoke this method instead. /// - /// [formatargs]: ../macro.format_args!.html - /// [write]: ../macro.write!.html + /// [formatargs]: ../macro.format_args.html + /// [write]: ../macro.write.html /// /// This function internally uses the [`write_all`][writeall] method on /// this trait and hence will continuously write data so long as no errors |