diff options
| author | bors <bors@rust-lang.org> | 2020-06-01 05:21:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-01 05:21:50 +0000 |
| commit | b85e3fe010413b8c528d4de593d912a5ba024653 (patch) | |
| tree | e0134fe42a0e4660f6fb363a5af4e8c482a499be /src/libcore | |
| parent | 0d93d3f4a42fd45b2a0da658d39555316a1b6793 (diff) | |
| parent | 16b4dc0489fca20d328c8f6effb8d7a9d1ef944d (diff) | |
Auto merge of #72844 - Dylan-DPC:rollup-i51qv5z, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #72776 (fulfill: try using SmallVec or Box for stalled_on) - #72818 (Clean up E0622 explanation) - #72823 (Add descriptions for all queries) - #72832 (RELEASES.md: Expand `cargo tree` note to mention `cargo tree -d`) - #72834 (Rephrase term 'non-pointer type') Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/ops/deref.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/ops/deref.rs b/src/libcore/ops/deref.rs index 6e96aa330ff..3faeb170b06 100644 --- a/src/libcore/ops/deref.rs +++ b/src/libcore/ops/deref.rs @@ -18,8 +18,8 @@ /// /// If `T` implements `Deref<Target = U>`, and `x` is a value of type `T`, then: /// -/// * In immutable contexts, `*x` on non-pointer types is equivalent to -/// `*Deref::deref(&x)`. +/// * In immutable contexts, `*x` (where `T` is neither a reference nor a raw pointer) +/// is equivalent to `*Deref::deref(&x)`. /// * Values of type `&T` are coerced to values of type `&U` /// * `T` implicitly implements all the (immutable) methods of the type `U`. /// @@ -115,8 +115,8 @@ impl<T: ?Sized> Deref for &mut T { /// If `T` implements `DerefMut<Target = U>`, and `x` is a value of type `T`, /// then: /// -/// * In mutable contexts, `*x` on non-pointer types is equivalent to -/// `*DerefMut::deref_mut(&mut x)`. +/// * In mutable contexts, `*x` (where `T` is neither a reference nor a raw pointer) +/// is equivalent to `*DerefMut::deref_mut(&mut x)`. /// * Values of type `&mut T` are coerced to values of type `&mut U` /// * `T` implicitly implements all the (mutable) methods of the type `U`. /// |
