diff options
| author | bors <bors@rust-lang.org> | 2016-05-21 00:38:55 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-21 00:38:55 -0700 |
| commit | da41920919ef4164c91541b8da501e36e9544c0f (patch) | |
| tree | a2520338eb518efcc17a1d731081ab6934805591 /src/libstd | |
| parent | 91e907345c4258ff9787d70a4b8c56cb691a64b6 (diff) | |
| parent | 61b9be776e7e5dd87c4eda7be29f0166287c139d (diff) | |
| download | rust-da41920919ef4164c91541b8da501e36e9544c0f.tar.gz rust-da41920919ef4164c91541b8da501e36e9544c0f.zip | |
Auto merge of #33768 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #33578, #33679, #33743, #33746, #33747, #33750, #33757 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/once.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index d8a4a69c73c..e9ea465cc99 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -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, } @@ -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 { @@ -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 } |
