Skip to content

Commit ceb0466

Browse files
committed
clean up existing poison files
1 parent 29a5872 commit ceb0466

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

library/std/src/sync/poison.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
//! depend on the primitive. See [#Overview] below.
1414
//!
1515
//! For the alternative implementations that do not employ poisoning,
16-
//! see `std::sync::nonpoisoning`.
16+
//! see [`std::sync::nonpoison`].
17+
//!
18+
//! [`std::sync::nonpoison`]: crate::sync::nonpoison
1719
//!
1820
//! # Overview
1921
//!
@@ -56,8 +58,6 @@
5658
//! while it is locked exclusively (write mode). If a panic occurs in any reader,
5759
//! then the lock will not be poisoned.
5860
59-
// FIXME(sync_nonpoison) add links to sync::nonpoison to the doc comment above.
60-
6161
#[stable(feature = "rust1", since = "1.0.0")]
6262
pub use self::condvar::{Condvar, WaitTimeoutResult};
6363
#[unstable(feature = "mapped_lock_guards", issue = "117108")]

library/std/src/sync/poison/condvar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::time::{Duration, Instant};
1313
#[stable(feature = "wait_timeout", since = "1.5.0")]
1414
pub struct WaitTimeoutResult(bool);
1515

16-
// FIXME(sync_nonpoison): `WaitTimeoutResult` is actually poisoning-agnostic, it seems.
16+
// FIXME(nonpoison_condvar): `WaitTimeoutResult` is actually poisoning-agnostic, it seems.
1717
// Should we take advantage of this fact?
1818
impl WaitTimeoutResult {
1919
/// Returns `true` if the wait was known to have timed out.

library/std/src/sync/poison/mutex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ impl<T: ?Sized + fmt::Debug> fmt::Debug for Mutex<T> {
650650
d.field("data", &&**err.get_ref());
651651
}
652652
Err(TryLockError::WouldBlock) => {
653-
d.field("data", &format_args!("<locked>"));
653+
d.field("data", &"<locked>");
654654
}
655655
}
656656
d.field("poisoned", &self.poison.get());

0 commit comments

Comments
 (0)