diff options
| author | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-23 13:46:14 +0000 |
| commit | 2bb8fca18215298487a8684a132da828fdb5a751 (patch) | |
| tree | 85c998b7c0ca6f5f97226790c95650e843566882 /src/libstd/lib.rs | |
| parent | a3f0ee9a7b17d522bfc6385f841d040445730f28 (diff) | |
| parent | 96efcdf0657004e48a279a469c42fe3097b2e8be (diff) | |
| download | rust-2bb8fca18215298487a8684a132da828fdb5a751.tar.gz rust-2bb8fca18215298487a8684a132da828fdb5a751.zip | |
Auto merge of #44058 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #43631, #43977, #43983, #44016, #44039, #44043, #44047, #44054 - Failed merges:
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 880caa2ade5..30495f29745 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -81,7 +81,7 @@ //! Note the documentation for the primitives [`str`] and [`[T]`][slice] (also //! called 'slice'). Many method calls on [`String`] and [`Vec<T>`] are actually //! calls to methods on [`str`] and [`[T]`][slice] respectively, via [deref -//! coercions]. +//! coercions][deref-coercions]. //! //! Third, the standard library defines [The Rust Prelude], a small collection //! of items - mostly traits - that are imported into every module of every @@ -203,7 +203,7 @@ //! [`use`]: ../book/first-edition/crates-and-modules.html#importing-modules-with-use //! [crate root]: ../book/first-edition/crates-and-modules.html#basic-terminology-crates-and-modules //! [crates.io]: https://crates.io -//! [deref coercions]: ../book/first-edition/deref-coercions.html +//! [deref-coercions]: ../book/second-edition/ch15-02-deref.html#implicit-deref-coercions-with-functions-and-methods //! [files]: fs/struct.File.html //! [multithreading]: thread/index.html //! [other]: #what-is-in-the-standard-library-documentation |