about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2017-02-22 09:30:46 -0800
committerRaph Levien <raph@google.com>2017-02-22 09:30:46 -0800
commitb3ee2490c2cba3f58476e520468afe0b828c0aa6 (patch)
tree7f17f972f658ed00a7c310fd1448e9ab96eb07d9 /src/libstd/sync
parent81b9b3c542e0f3c3df799a9d66bb0120c7dbc44c (diff)
parentfc6f092c21a7a7249a9f8860f3cd10160aa36c02 (diff)
downloadrust-b3ee2490c2cba3f58476e520468afe0b828c0aa6.tar.gz
rust-b3ee2490c2cba3f58476e520468afe0b828c0aa6.zip
Merge branch 'master' of https://github.com/rust-lang/rust into readdir
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/once.rs2
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();