Skip to content

Rollup of 7 pull requests #33768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
May 21, 2016
Merged
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
38e1797
rustdoc: Add doc snippets for trait impls, with a read more link
Manishearth May 17, 2016
8e94b04
rustdoc: Support short doc fallback for non-default items
Manishearth May 17, 2016
74633b0
Move read more link to same line
Manishearth May 18, 2016
519cc82
Book: small improvement to a table to make it clearer
royalstream May 19, 2016
2fd4e60
Clarify the English translation of `?Sized`
postmodern May 20, 2016
d021d7d
Keep line-width within 80 columns
postmodern May 20, 2016
d8c086b
Grammar change
postmodern May 20, 2016
e614bb7
book: ownership: fix typo
alx741 May 20, 2016
9ce018b
Update tests
Manishearth May 18, 2016
bbed89b
Update simd syntax
GuillaumeGomez May 20, 2016
bf8c070
Clarify docs for sort(&mut self)
dns2utf8 May 19, 2016
b9d1e76
update tracking issue for once_poison
durka May 12, 2016
71af58a
Wording changes
postmodern May 21, 2016
87a2288
Rollup merge of #33578 - durka:patch-21, r=alexcrichton
Manishearth May 21, 2016
3f4d915
Rollup merge of #33679 - Manishearth:rustdoc-readmore-impls, r=alexcr…
Manishearth May 21, 2016
0c949d8
Rollup merge of #33743 - royalstream:royalstream-stack-doc, r=stevekl…
Manishearth May 21, 2016
c57bb10
Rollup merge of #33746 - dns2utf8:doc_sort_memory, r=steveklabnik
Manishearth May 21, 2016
f262bb8
Rollup merge of #33747 - postmodern:patch-2, r=Manishearth
Manishearth May 21, 2016
197aa52
Rollup merge of #33750 - alx741:fix_typo, r=Manishearth
Manishearth May 21, 2016
61b9be7
Rollup merge of #33757 - GuillaumeGomez:simd, r=steveklabnik
Manishearth May 21, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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