Skip to content

Commit 36ba96e

Browse files
committed
Implement Debug for RwLock, arc::Weak and Mutex
1 parent 522d09d commit 36ba96e

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

src/liballoc/arc.rs

+7
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ pub struct Weak<T> {
139139
unsafe impl<T: Sync + Send> Send for Weak<T> { }
140140
unsafe impl<T: Sync + Send> Sync for Weak<T> { }
141141

142+
#[stable(feature = "rust1", since = "1.0.0")]
143+
impl<T: fmt::Debug> fmt::Debug for Weak<T> {
144+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
145+
write!(f, "(Weak)")
146+
}
147+
}
148+
142149
struct ArcInner<T> {
143150
strong: atomic::AtomicUsize,
144151
weak: atomic::AtomicUsize,

src/libstd/sync/mutex.rs

+14
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use marker;
1515
use ops::{Deref, DerefMut};
1616
use sync::poison::{self, TryLockError, TryLockResult, LockResult};
1717
use sys_common::mutex as sys;
18+
use fmt;
1819

1920
/// A mutual exclusion primitive useful for protecting shared data
2021
///
@@ -252,6 +253,19 @@ impl<T: Send + 'static> Drop for Mutex<T> {
252253
}
253254
}
254255

256+
#[stable(feature = "rust1", since = "1.0.0")]
257+
impl<T: fmt::Debug + Send + 'static> fmt::Debug for Mutex<T> {
258+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
259+
match self.try_lock() {
260+
Ok(guard) => write!(f, "Mutex {{ data: {:?} }}", *guard),
261+
Err(TryLockError::Poisoned(err)) => {
262+
write!(f, "Mutex {{ data: Poisoned({:?}) }}", **err.get_ref())
263+
},
264+
Err(TryLockError::WouldBlock) => write!(f, "Mutex {{ <locked> }}")
265+
}
266+
}
267+
}
268+
255269
struct Dummy(UnsafeCell<()>);
256270
unsafe impl Sync for Dummy {}
257271
static DUMMY: Dummy = Dummy(UnsafeCell { value: () });

src/libstd/sync/rwlock.rs

+14
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use marker;
1515
use ops::{Deref, DerefMut};
1616
use sync::poison::{self, LockResult, TryLockError, TryLockResult};
1717
use sys_common::rwlock as sys;
18+
use fmt;
1819

1920
/// A reader-writer lock
2021
///
@@ -258,6 +259,19 @@ impl<T> Drop for RwLock<T> {
258259
}
259260
}
260261

262+
#[stable(feature = "rust1", since = "1.0.0")]
263+
impl<T: fmt::Debug + Send + Sync> fmt::Debug for RwLock<T> {
264+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
265+
match self.try_read() {
266+
Ok(guard) => write!(f, "RwLock {{ data: {:?} }}", *guard),
267+
Err(TryLockError::Poisoned(err)) => {
268+
write!(f, "RwLock {{ data: Poisoned({:?}) }}", **err.get_ref())
269+
},
270+
Err(TryLockError::WouldBlock) => write!(f, "RwLock {{ <locked> }}")
271+
}
272+
}
273+
}
274+
261275
struct Dummy(UnsafeCell<()>);
262276
unsafe impl Sync for Dummy {}
263277
static DUMMY: Dummy = Dummy(UnsafeCell { value: () });

0 commit comments

Comments
 (0)