diff options
| author | bors <bors@rust-lang.org> | 2016-05-15 08:37:09 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-15 08:37:09 -0700 |
| commit | 9f58fb776a74a44f4fcc2cb57084d33c55530aa4 (patch) | |
| tree | 007f7ad1fef9ac62eeefe2b9f36eafba11431b4b /src/libstd/sync | |
| parent | b3583193531c124e36aa1813cf5f8b8e667d016c (diff) | |
| parent | 95ace6be43d3e037f8b812e03bd8ace3b0d9e50a (diff) | |
| download | rust-9f58fb776a74a44f4fcc2cb57084d33c55530aa4.tar.gz rust-9f58fb776a74a44f4fcc2cb57084d33c55530aa4.zip | |
Auto merge of #33658 - Manishearth:rollup, r=Manishearth
Rollup of 14 pull requests - Successful merges: #33342, #33393, #33415, #33475, #33517, #33533, #33534, #33565, #33580, #33584, #33585, #33590, #33591, #33598 - Failed merges: #33578
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/once.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index e228d236a3c..d8a4a69c73c 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -218,7 +218,6 @@ 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). - /// poisoned or not. #[unstable(feature = "once_poison", issue = "31688")] 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`. |