about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2019-01-17 20:03:59 +0100
committerMara Bos <m-ou.se@m-ou.se>2019-01-17 20:03:59 +0100
commit2e9deed9f130d2342bec2a55358305cb7137605e (patch)
tree5a8b486871038b6da18bf9c0e6cf794de175f720 /src/libstd/sync
parent7b557119883685e541d555135fb81c0dc10e2752 (diff)
downloadrust-2e9deed9f130d2342bec2a55358305cb7137605e.tar.gz
rust-2e9deed9f130d2342bec2a55358305cb7137605e.zip
Simplify Debug implementation of MutexGuard.
Just transparently print the guarded data, instead of wrapping it in
`MutexGuard { lock: Mutex { data: ... } }`.
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mutex.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
index e4cc2979207..59829db23cb 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -450,13 +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 {
-        struct MutexFmt<'a, T: ?Sized>(&'a MutexGuard<'a, T>);
-        impl<'a, T: ?Sized + fmt::Debug> fmt::Debug for MutexFmt<'a, T> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.debug_struct("Mutex").field("data", &&*self.0).finish()
-            }
-        }
-        f.debug_struct("MutexGuard").field("lock", &MutexFmt(self)).finish()
+        fmt::Debug::fmt(&**self, f)
     }
 }