diff options
| author | bors <bors@rust-lang.org> | 2014-12-31 21:01:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-31 21:01:42 +0000 |
| commit | 10d99a973498c5a1be6ba318210751efc1c2cf61 (patch) | |
| tree | 7f6c86aebf4ac2cf41fadaeef8d1548147ab70d9 /src/libstd/sync | |
| parent | 84f5ad8679c7fc454473ffbf389030f3e5fee379 (diff) | |
| parent | 139f44bae82a7c74bcda9cb2b16dd2ab93f18b17 (diff) | |
| download | rust-10d99a973498c5a1be6ba318210751efc1c2cf61.tar.gz rust-10d99a973498c5a1be6ba318210751efc1c2cf61.zip | |
auto merge of #20360 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/atomic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/atomic.rs b/src/libstd/sync/atomic.rs index bdf947438f3..18c917aca8a 100644 --- a/src/libstd/sync/atomic.rs +++ b/src/libstd/sync/atomic.rs @@ -101,9 +101,9 @@ use core::mem; use core::prelude::{Send, Drop, None, Option, Some}; pub use core::atomic::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr}; -pub use core::atomic::{Ordering, Relaxed, Release, Acquire, AcqRel, SeqCst}; pub use core::atomic::{INIT_ATOMIC_BOOL, INIT_ATOMIC_INT, INIT_ATOMIC_UINT}; pub use core::atomic::fence; +pub use core::atomic::Ordering::{mod, Relaxed, Release, Acquire, AcqRel, SeqCst}; /// An atomic, nullable unique pointer /// |