diff options
| author | bors <bors@rust-lang.org> | 2019-01-26 18:14:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-26 18:14:46 +0000 |
| commit | 20c2cba61dc83e612d25ed496025171caa3db30f (patch) | |
| tree | f6294c9e220acd5733dfe7b39541f4e2640c7187 /src/libstd/sync | |
| parent | 46a43dc1e987156c4c03a8c92c8ba7b21363982b (diff) | |
| parent | 97833ee506d2b69c46bad4aad07aab89c7f03516 (diff) | |
| download | rust-20c2cba61dc83e612d25ed496025171caa3db30f.tar.gz rust-20c2cba61dc83e612d25ed496025171caa3db30f.zip | |
Auto merge of #57918 - Centril:rollup, r=Centril
Rollup of 7 pull requests Successful merges: - #57407 (Stabilize extern_crate_self) - #57703 (Make MutexGuard's Debug implementation more useful.) - #57764 (Fix some minor warnings) - #57825 (un-deprecate mem::zeroed) - #57827 (Ignore aarch64 in simd-intrinsic-generic-reduction) - #57908 (resolve: Fix span arithmetics in the import conflict error) - #57913 (Change crate-visibility-modifier issue number in The Unstable Book) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mutex.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 856bb260424..59829db23cb 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -450,9 +450,7 @@ impl<'a, T: ?Sized> Drop for MutexGuard<'a, T> { #[stable(feature = "std_debug", since = "1.16.0")] impl<'a, T: ?Sized + fmt::Debug> fmt::Debug for MutexGuard<'a, T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.debug_struct("MutexGuard") - .field("lock", &self.__lock) - .finish() + fmt::Debug::fmt(&**self, f) } } |