about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-06 07:02:25 +0000
committerbors <bors@rust-lang.org>2018-02-06 07:02:25 +0000
commitb224fc84e3438117b218ec6b57fdc3ea8a3d1c2e (patch)
treefdea43c93e46ce70ebc3a9f102a0bfa37cd6e69b /src/libcore
parent6c04c41034c46730fba97bfe9cfa2dd0687c2a5f (diff)
parent0553dc81d38cf7bd81334477b0338ef46da50e18 (diff)
downloadrust-b224fc84e3438117b218ec6b57fdc3ea8a3d1c2e.tar.gz
rust-b224fc84e3438117b218ec6b57fdc3ea8a3d1c2e.zip
Auto merge of #48017 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests

- Successful merges: #46030, #47496, #47543, #47704, #47753, #47807, #47948, #47959, #48003, #48007
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/convert.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index e815d72d366..d3a83dc795c 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -141,9 +141,9 @@ pub trait AsRef<T: ?Sized> {
 ///
 /// # Generic Implementations
 ///
-/// - `AsMut` auto-dereferences if the inner type is a reference or a mutable
-///   reference (e.g.: `foo.as_ref()` will work the same if `foo` has type
-///   `&mut Foo` or `&&mut Foo`)
+/// - `AsMut` auto-dereferences if the inner type is a mutable reference
+///   (e.g.: `foo.as_mut()` will work the same if `foo` has type `&mut Foo`
+///   or `&mut &mut Foo`)
 ///
 /// # Examples
 ///