diff options
| author | bors <bors@rust-lang.org> | 2017-03-21 17:02:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-21 17:02:38 +0000 |
| commit | 58c701f5c7dc26d9b55c631006ece52abe1ddce2 (patch) | |
| tree | e14d7a2767b4356590cc377267e3307275ed07f6 /src/liballoc | |
| parent | 53eb08bedc8719844bb553dbe1a39d9010783ff5 (diff) | |
| parent | b6240e51ae5657db0185002e725a5a717987fee0 (diff) | |
| download | rust-58c701f5c7dc26d9b55c631006ece52abe1ddce2.tar.gz rust-58c701f5c7dc26d9b55c631006ece52abe1ddce2.zip | |
Auto merge of #40693 - frewsxcv:rollup, r=frewsxcv
Rollup of 10 pull requests - Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685 - 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 1d616233881..28f6d97756f 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-functions +/// [assoc]: ../../book/first-edition/method-syntax.html#associated-functions /// /// # Examples /// diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index e9b59017692..561ccaa5ef5 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-functions +//! [assoc]: ../../book/first-edition/method-syntax.html#associated-functions //! [mutability]: ../../std/cell/index.html#introducing-mutability-inside-of-something-immutable #![stable(feature = "rust1", since = "1.0.0")] |