Skip to content

Commit

Permalink
Rollup merge of rust-lang#39862 - stjepang:fix-wording-localkey, r=Gu…
Browse files Browse the repository at this point in the history
…illaumeGomez

Fix wording in LocalKey documentation

Fixes rust-lang#39841

r? @GuillaumeGomez
  • Loading branch information
frewsxcv authored Feb 17, 2017
2 parents f3d4c8c + 1fbbe79 commit f03656a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/libstd/sync/once.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ impl Once {
}

// Once we've enqueued ourselves, wait in a loop.
// Aftewards reload the state and continue with what we
// Afterwards reload the state and continue with what we
// were doing from before.
while !node.signaled.load(Ordering::SeqCst) {
thread::park();
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/thread/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ use mem;
/// # Initialization and Destruction
///
/// Initialization is dynamically performed on the first call to `with()`
/// within a thread, and values support destructors which will be run when a
/// thread exits.
/// within a thread, and values that implement `Drop` get destructed when a
/// thread exits. Some caveats apply, which are explained below.
///
/// # Examples
///
Expand Down

0 comments on commit f03656a

Please sign in to comment.