diff options
| author | bors <bors@rust-lang.org> | 2018-09-08 04:14:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-08 04:14:54 +0000 |
| commit | 06da917b015a2eceac0e3cca22f9660edef25178 (patch) | |
| tree | 8eef3df0e3912cabd16ee31bb6987ccb1db078b2 /src/liballoc | |
| parent | 295ad30ef452de5331edb5e0ee6f666f632758c4 (diff) | |
| parent | d5409141d62287b4597a7c05735406a2305fd134 (diff) | |
| download | rust-06da917b015a2eceac0e3cca22f9660edef25178.tar.gz rust-06da917b015a2eceac0e3cca22f9660edef25178.zip | |
Auto merge of #51885 - GuillaumeGomez:trait-impl-show-docs, r=Mark-Simulacrum,QuietMisdreavus
Trait impl show docs Fixes #51834. <img width="1440" alt="screen shot 2018-06-29 at 00 14 33" src="https://user-images.githubusercontent.com/3050060/42063323-6e6e8cc8-7b31-11e8-88ef-4dd2229df76c.png"> (You can see both commit changes in the screenshot 😄) r? @QuietMisdreavus
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/rc.rs | 10 | ||||
| -rw-r--r-- | src/liballoc/string.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/sync.rs | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 2d65aaecbd0..fcd683e5e87 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -806,9 +806,7 @@ unsafe impl<#[may_dangle] T: ?Sized> Drop for Rc<T> { /// /// This will decrement the strong reference count. If the strong reference /// count reaches zero then the only other references (if any) are - /// [`Weak`][weak], so we `drop` the inner value. - /// - /// [weak]: struct.Weak.html + /// [`Weak`], so we `drop` the inner value. /// /// # Examples /// @@ -1173,9 +1171,8 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Weak<U>> for Weak<T> {} impl<T> Weak<T> { /// Constructs a new `Weak<T>`, without allocating any memory. - /// Calling [`upgrade`] on the return value always gives [`None`]. + /// Calling [`upgrade`][Weak::upgrade] on the return value always gives [`None`]. /// - /// [`upgrade`]: struct.Weak.html#method.upgrade /// [`None`]: ../../std/option/enum.Option.html /// /// # Examples @@ -1321,9 +1318,8 @@ impl<T: ?Sized + fmt::Debug> fmt::Debug for Weak<T> { #[stable(feature = "downgraded_weak", since = "1.10.0")] impl<T> Default for Weak<T> { /// Constructs a new `Weak<T>`, allocating memory for `T` without initializing - /// it. Calling [`upgrade`] on the return value always gives [`None`]. + /// it. Calling [`upgrade`][Weak::upgrade] on the return value always gives [`None`]. /// - /// [`upgrade`]: struct.Weak.html#method.upgrade /// [`None`]: ../../std/option/enum.Option.html /// /// # Examples diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index aa821abb34c..837e17cf640 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -1927,9 +1927,7 @@ impl<'a> Add<&'a str> for String { /// Implements the `+=` operator for appending to a `String`. /// -/// This has the same behavior as the [`push_str`] method. -/// -/// [`push_str`]: struct.String.html#method.push_str +/// This has the same behavior as the [`push_str`][String::push_str] method. #[stable(feature = "stringaddassign", since = "1.12.0")] impl<'a> AddAssign<&'a str> for String { #[inline] diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index ff45daef514..8b4231dbdf6 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -916,9 +916,7 @@ unsafe impl<#[may_dangle] T: ?Sized> Drop for Arc<T> { /// /// This will decrement the strong reference count. If the strong reference /// count reaches zero then the only other references (if any) are - /// [`Weak`][weak], so we `drop` the inner value. - /// - /// [weak]: struct.Weak.html + /// [`Weak`], so we `drop` the inner value. /// /// # Examples /// @@ -1159,9 +1157,9 @@ impl<T: ?Sized> Clone for Weak<T> { #[stable(feature = "downgraded_weak", since = "1.10.0")] impl<T> Default for Weak<T> { /// Constructs a new `Weak<T>`, without allocating memory. - /// Calling [`upgrade`] on the return value always gives [`None`]. + /// Calling [`upgrade`][Weak::upgrade] on the return value always + /// gives [`None`]. /// - /// [`upgrade`]: struct.Weak.html#method.upgrade /// [`None`]: ../../std/option/enum.Option.html#variant.None /// /// # Examples |
