diff options
| author | bors <bors@rust-lang.org> | 2017-02-18 17:10:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-18 17:10:34 +0000 |
| commit | 306035c21741928bef75b8915d2195cce400b70a (patch) | |
| tree | 4aa49cfb106dc1deb4b2b52a11ea577efa7b21db /src/libstd/sync | |
| parent | 8f2fc9db15d41285619138900c6f65686bd32a2a (diff) | |
| parent | 98c2cf2ae5ee9ec69d06b32964156a13c94f4402 (diff) | |
| download | rust-306035c21741928bef75b8915d2195cce400b70a.tar.gz rust-306035c21741928bef75b8915d2195cce400b70a.zip | |
Auto merge of #39933 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests - Successful merges: #39847, #39862, #39898, #39904, #39928 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/once.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index ba993751391..1e7394c0b09 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -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(); |