diff options
| author | bors <bors@rust-lang.org> | 2018-11-22 10:04:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-22 10:04:41 +0000 |
| commit | 93fa2d76bd9a8ffbbb46df2da6d27c13ee7fa73e (patch) | |
| tree | 35b359452ea12e799c831d01c01262ec7fc1d4ec /src/libcore/mem.rs | |
| parent | f3adec65dd0b05a0a30cd2c134f252e8bece0b76 (diff) | |
| parent | 61d7b3e9b028ba1a682448e8bdc6212552ce1ff3 (diff) | |
Auto merge of #56155 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #55367 (lint if a private item has doctests) - #55485 (Return &T / &mut T in ManuallyDrop Deref(Mut) impl) - #55784 (Clarifying documentation for collections::hash_map::Entry::or_insert) - #55961 (Fix VecDeque pretty-printer) - #55980 (Suggest on closure args count mismatching with pipe span) - #56002 (fix #55972: Erroneous self arguments on bare functions emit subpar compilation error) - #56063 (Update any.rs documentation using keyword dyn) - #56067 (Add SGX target to rustc) - #56078 (Fix error message for `-C panic=xxx`.) - #56106 (Remove some incorrect doc comments) - #56126 (core/benches/num: Add `from_str/from_str_radix()` benchmarks) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore/mem.rs')
| -rw-r--r-- | src/libcore/mem.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 6b2d878b3e7..56ba10c49f4 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -1016,7 +1016,7 @@ impl<T: ?Sized> ManuallyDrop<T> { impl<T: ?Sized> Deref for ManuallyDrop<T> { type Target = T; #[inline] - fn deref(&self) -> &Self::Target { + fn deref(&self) -> &T { &self.value } } @@ -1024,7 +1024,7 @@ impl<T: ?Sized> Deref for ManuallyDrop<T> { #[stable(feature = "manually_drop", since = "1.20.0")] impl<T: ?Sized> DerefMut for ManuallyDrop<T> { #[inline] - fn deref_mut(&mut self) -> &mut Self::Target { + fn deref_mut(&mut self) -> &mut T { &mut self.value } } |
