Auto merge of #35856 - phimuemue:master, r=brson

[rust.git] / src / libstd / sync / barrier.rs

diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs
index b543240c15afb898ff98b5027ef0cbe703711792..ac0f400379e3cabf3504a10b496426774e2c0659 100644 (file)
--- a/src/libstd/sync/barrier.rs
+++ b/src/libstd/sync/barrier.rs
@@ -71,7 +71,7 @@ pub fn new(n: usize) -> Barrier {
         }
     }
 
-    /// Blocks the current thread until all threads has rendezvoused here.
+    /// Blocks the current thread until all threads have rendezvoused here.
     ///
     /// Barriers are re-usable after all threads have rendezvoused once, and can
     /// be used continuously.
@@ -113,8 +113,6 @@ pub fn is_leader(&self) -> bool { self.0 }
 
 #[cfg(test)]
 mod tests {
-    use prelude::v1::*;
-
     use sync::{Arc, Barrier};
     use sync::mpsc::{channel, TryRecvError};
     use thread;