about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-18 02:51:49 -0800
committerbors <bors@rust-lang.org>2014-02-18 02:51:49 -0800
commitb3ed38f2196e8636f9f295da8d06c6921db183fe (patch)
tree02968a54be00a4a213dece5f5900230809ce7f5a /src/libstd/sync
parent1e60084257ca6f264610544964bf553f1feba83b (diff)
parent6555b04dd2fbcd18c8fa8beb2bebc4b81febc6b0 (diff)
downloadrust-b3ed38f2196e8636f9f295da8d06c6921db183fe.tar.gz
rust-b3ed38f2196e8636f9f295da8d06c6921db183fe.zip
auto merge of #12345 : huonw/rust/speeling, r=cmr
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc_queue.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc_queue.rs b/src/libstd/sync/mpsc_queue.rs
index b5a55f3f8c9..2dc63380cb8 100644
--- a/src/libstd/sync/mpsc_queue.rs
+++ b/src/libstd/sync/mpsc_queue.rs
@@ -104,7 +104,7 @@ impl<T: Send> Queue<T> {
     ///
     /// Note that the current implementation means that this function cannot
     /// return `Option<T>`. It is possible for this queue to be in an
-    /// inconsistent state where many pushes have suceeded and completely
+    /// inconsistent state where many pushes have succeeded and completely
     /// finished, but pops cannot return `Some(t)`. This inconsistent state
     /// happens when a pusher is pre-empted at an inopportune moment.
     ///
@@ -203,4 +203,3 @@ mod tests {
         }
     }
 }
-