diff options
| author | bors <bors@rust-lang.org> | 2013-08-27 13:20:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-27 13:20:47 -0700 |
| commit | 3ab0561b00d2993706d11bfbbce4a357110195dd (patch) | |
| tree | 7536debfcd076b92e9eb6b0c8b871eac1be22129 /src/libstd/rt/message_queue.rs | |
| parent | c822d1070ac39871165df30ac8d09e733a6e7fb9 (diff) | |
| parent | a79575529de2c6c74b430cd2d9e2d8833eac2f82 (diff) | |
| download | rust-3ab0561b00d2993706d11bfbbce4a357110195dd.tar.gz rust-3ab0561b00d2993706d11bfbbce4a357110195dd.zip | |
auto merge of #8790 : huonw/rust/unsafearc, r=thestinger
`UnsafeAtomicRcBox` → `UnsafeArc` (#7674), and `AtomicRcBoxData` → `ArcData` to reflect this. Also, the inner pointer of `UnsafeArc` is now `*mut ArcData`, which avoids some transmutes to `~`: i.e. less chance of mistakes.
Diffstat (limited to 'src/libstd/rt/message_queue.rs')
| -rw-r--r-- | src/libstd/rt/message_queue.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/message_queue.rs b/src/libstd/rt/message_queue.rs index 2bbcaff6d28..99b5156b319 100644 --- a/src/libstd/rt/message_queue.rs +++ b/src/libstd/rt/message_queue.rs @@ -16,11 +16,11 @@ use kinds::Send; use vec::OwnedVector; use cell::Cell; use option::*; -use unstable::sync::{UnsafeAtomicRcBox, LittleLock}; +use unstable::sync::{UnsafeArc, LittleLock}; use clone::Clone; pub struct MessageQueue<T> { - priv state: UnsafeAtomicRcBox<State<T>> + priv state: UnsafeArc<State<T>> } struct State<T> { @@ -32,7 +32,7 @@ struct State<T> { impl<T: Send> MessageQueue<T> { pub fn new() -> MessageQueue<T> { MessageQueue { - state: UnsafeAtomicRcBox::new(State { + state: UnsafeArc::new(State { count: 0, queue: ~[], lock: LittleLock::new() |
