diff options
| author | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
| commit | 470118f3e915cdc8f936aca0640b28a7a3d8dc6c (patch) | |
| tree | 47f99908d999aa612a4cd44932dcdc3b3a1a966a /src/libstd/sync/atomic.rs | |
| parent | c6c786671d692d7b13c2e5c68a53001327b4b125 (diff) | |
| parent | 351409a62287c7993bc680d9dfcfa13cba9c9c0c (diff) | |
auto merge of #20504 : japaric/rust/derive-self, r=alexcrichton
I put the sed scripts in the commits, in case this needs a "rebase".
Diffstat (limited to 'src/libstd/sync/atomic.rs')
| -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 d4d7607bde3..3652b45ce97 100644 --- a/src/libstd/sync/atomic.rs +++ b/src/libstd/sync/atomic.rs @@ -104,7 +104,7 @@ pub use core::atomic::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr}; pub use core::atomic::{INIT_ATOMIC_BOOL, INIT_ATOMIC_INT, INIT_ATOMIC_UINT}; pub use core::atomic::{ATOMIC_BOOL_INIT, ATOMIC_INT_INIT, ATOMIC_UINT_INIT}; pub use core::atomic::fence; -pub use core::atomic::Ordering::{mod, Relaxed, Release, Acquire, AcqRel, SeqCst}; +pub use core::atomic::Ordering::{self, Relaxed, Release, Acquire, AcqRel, SeqCst}; /// An atomic, nullable unique pointer /// |