diff options
| author | bors <bors@rust-lang.org> | 2017-02-20 18:58:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-20 18:58:28 +0000 |
| commit | c1368fc4f497b6387b00850dc5a95df5d6974b43 (patch) | |
| tree | be7ffac7211cbedf53d95320197a17ec97248a49 /src/liballoc | |
| parent | 5b7c5563855123ab094db99d42ccab5f26dbccdf (diff) | |
| parent | 9a8dbbe918da20eb75b924ecc0742e42c70c3709 (diff) | |
| download | rust-c1368fc4f497b6387b00850dc5a95df5d6974b43.tar.gz rust-c1368fc4f497b6387b00850dc5a95df5d6974b43.zip | |
Auto merge of #39981 - frewsxcv:rollup, r=frewsxcv
Rollup of 3 pull requests - Successful merges: #39913, #39937, #39976 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 210917b68a2..38d843263ff 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -102,7 +102,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize; /// [downgrade]: struct.Arc.html#method.downgrade /// [upgrade]: struct.Weak.html#method.upgrade /// [`None`]: ../../std/option/enum.Option.html#variant.None -/// [assoc]: ../../book/method-syntax.html#Associated%20functions +/// [assoc]: ../../book/method-syntax.html#associated-functions /// /// # Examples /// diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index a874e938a40..6108a06634b 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -215,7 +215,7 @@ //! [downgrade]: struct.Rc.html#method.downgrade //! [upgrade]: struct.Weak.html#method.upgrade //! [`None`]: ../../std/option/enum.Option.html#variant.None -//! [assoc]: ../../book/method-syntax.html#Associated%20functions +//! [assoc]: ../../book/method-syntax.html#associated-functions //! [mutability]: ../../std/cell/index.html#introducing-mutability-inside-of-something-immutable #![stable(feature = "rust1", since = "1.0.0")] |