Skip to content

Commit

Permalink
Rollup merge of rust-lang#33578 - durka:patch-21, r=alexcrichton
Browse files Browse the repository at this point in the history
update tracking issue for once_poison

The tracking issue for once_poison was noted as rust-lang#31688 which was closed, so it now points to the new rust-lang#33577.
  • Loading branch information
Manishearth committed May 21, 2016
2 parents 500e5c1 + b9d1e76 commit 87a2288
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libstd/sync/once.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ unsafe impl Send for Once {}

/// State yielded to the `call_once_force` method which can be used to query
/// whether the `Once` was previously poisoned or not.
#[unstable(feature = "once_poison", issue = "31688")]
#[unstable(feature = "once_poison", issue = "33577")]
pub struct OnceState {
poisoned: bool,
}
Expand Down Expand Up @@ -218,7 +218,7 @@ impl Once {
/// The closure `f` is yielded a structure which can be used to query the
/// state of this `Once` (whether initialization has previously panicked or
/// not).
#[unstable(feature = "once_poison", issue = "31688")]
#[unstable(feature = "once_poison", issue = "33577")]
pub fn call_once_force<F>(&'static self, f: F) where F: FnOnce(&OnceState) {
// same as above, just with a different parameter to `call_inner`.
if self.state.load(Ordering::SeqCst) == COMPLETE {
Expand Down Expand Up @@ -360,7 +360,7 @@ impl OnceState {
///
/// Once an initalization routine for a `Once` has panicked it will forever
/// indicate to future forced initialization routines that it is poisoned.
#[unstable(feature = "once_poison", issue = "31688")]
#[unstable(feature = "once_poison", issue = "33577")]
pub fn poisoned(&self) -> bool {
self.poisoned
}
Expand Down

0 comments on commit 87a2288

Please sign in to comment.