about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-06 08:31:28 +0000
committerbors <bors@rust-lang.org>2014-08-06 08:31:28 +0000
commit84782c4e2681496d57f1ac91468d21df085b7782 (patch)
treed3de416e5827122ec85f0a02388a48ee760ee77e /src/libstd/sync
parent223c043110c0eb35847bca41e58c0ce11110d78a (diff)
parent68bde0a07396efb415d61047c6b2a8183f47ef30 (diff)
downloadrust-84782c4e2681496d57f1ac91468d21df085b7782.tar.gz
rust-84782c4e2681496d57f1ac91468d21df085b7782.zip
auto merge of #16258 : aturon/rust/stabilize-atomics, r=alexcrichton
This commit stabilizes the `std::sync::atomics` module, renaming it to
`std::sync::atomic` to match library precedent elsewhere, and tightening
up behavior around incorrect memory ordering annotations.

The vast majority of the module is now `stable`. However, the
`AtomicOption` type has been deprecated, since it is essentially unused
and is not truly a primitive atomic type. It will eventually be replaced
by a higher-level abstraction like MVars.

Due to deprecations, this is a:

[breaking-change]
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mod.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs
index cc32818baa4..1d189f8d4bc 100644
--- a/src/libstd/sync/mod.rs
+++ b/src/libstd/sync/mod.rs
@@ -17,12 +17,18 @@
 
 #![experimental]
 
-pub use core_sync::{atomics, deque, mpmc_bounded_queue, mpsc_queue, spsc_queue};
+#[stable]
+pub use core_sync::atomic;
+
+pub use core_sync::{deque, mpmc_bounded_queue, mpsc_queue, spsc_queue};
 pub use core_sync::{Arc, Weak, Mutex, MutexGuard, Condvar, Barrier};
 pub use core_sync::{RWLock, RWLockReadGuard, RWLockWriteGuard};
 pub use core_sync::{Semaphore, SemaphoreGuard};
 pub use core_sync::one::{Once, ONCE_INIT};
 
+#[deprecated = "use atomic instead"]
+pub use atomics = core_sync::atomic;
+
 pub use self::future::Future;
 pub use self::task_pool::TaskPool;