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

[rust.git] / src / libcore / sync / atomic.rs

diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 14ce4f56fd22c587421b7a8002192c57a8dc084a..75ddd2021a8f7fa74f9afa82b162f3820b4d6142 100644 (file)
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -32,7 +32,7 @@
 //! atomically-reference-counted shared pointer).
 //!
 //! Most atomic types may be stored in static variables, initialized using
-//! the provided static initializers like `INIT_ATOMIC_BOOL`. Atomic statics
+//! the provided static initializers like `ATOMIC_BOOL_INIT`. Atomic statics
 //! are often used for lazy global initialization.
 //!
 //!
@@ -79,14 +79,8 @@
 
 use self::Ordering::*;
 
-use marker::{Send, Sync};
-
 use intrinsics;
 use cell::UnsafeCell;
-
-use result::Result::{self, Ok, Err};
-
-use default::Default;
 use fmt;
 
 /// A boolean type which can be safely shared between threads.