Make MutexGuard's Debug implementation more useful.

Fixes #57702.
rust-lang · Jan 17, 2019 · 7b55711 · 7b55711
1 parent daa53a5
commit 7b55711
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
@@ -450,9 +450,13 @@ 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()
+        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()
     }
 }