diff options
| author | bors <bors@rust-lang.org> | 2014-07-13 21:01:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-13 21:01:28 +0000 |
| commit | ffd9966c79ad034fe16e66e6c6795473473a6f50 (patch) | |
| tree | e50643ce8f24f411e120b8e1381b026d5d9fadc2 /src/libsync | |
| parent | 7a6208f2cc1bbe29dc42b21d27e98894b8bacc04 (diff) | |
| parent | e0ede9c6b3894851b800a323757857eba07943b5 (diff) | |
| download | rust-ffd9966c79ad034fe16e66e6c6795473473a6f50.tar.gz rust-ffd9966c79ad034fe16e66e6c6795473473a6f50.zip | |
auto merge of #15591 : aturon/rust/box-cell-stability, r=alexcrichton
This PR is the outcome of the library stabilization meeting for the `liballoc::owned` and `libcore::cell` modules. Aside from the stability attributes, there are a few breaking changes: * The `owned` modules is now named `boxed`, to better represent its contents. (`box` was unavailable, since it's a keyword.) This will help avoid the misconception that `Box` plays a special role wrt ownership. * The `AnyOwnExt` extension trait is renamed to `BoxAny`, and its `move` method is renamed to `downcast`, in both cases to improve clarity. * The recently-added `AnySendOwnExt` extension trait is removed; it was not being used and is unnecessary. [breaking-change]
Diffstat (limited to 'src/libsync')
| -rw-r--r-- | src/libsync/atomics.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/oneshot.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/select.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/shared.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/stream.rs | 2 | ||||
| -rw-r--r-- | src/libsync/comm/sync.rs | 2 | ||||
| -rw-r--r-- | src/libsync/deque.rs | 2 | ||||
| -rw-r--r-- | src/libsync/mpsc_queue.rs | 2 | ||||
| -rw-r--r-- | src/libsync/mutex.rs | 2 | ||||
| -rw-r--r-- | src/libsync/spsc_queue.rs | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/src/libsync/atomics.rs b/src/libsync/atomics.rs index 195efb844a7..0be124ad584 100644 --- a/src/libsync/atomics.rs +++ b/src/libsync/atomics.rs @@ -103,7 +103,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::mem; pub use core::atomics::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr}; diff --git a/src/libsync/comm/mod.rs b/src/libsync/comm/mod.rs index 6c09a021c43..e9a303634fe 100644 --- a/src/libsync/comm/mod.rs +++ b/src/libsync/comm/mod.rs @@ -320,7 +320,7 @@ use core::prelude::*; use alloc::arc::Arc; -use alloc::owned::Box; +use alloc::boxed::Box; use core::cell::Cell; use core::kinds::marker; use core::mem; diff --git a/src/libsync/comm/oneshot.rs b/src/libsync/comm/oneshot.rs index 742686069e2..c9782db5c24 100644 --- a/src/libsync/comm/oneshot.rs +++ b/src/libsync/comm/oneshot.rs @@ -34,7 +34,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::mem; use rustrt::local::Local; use rustrt::task::{Task, BlockedTask}; diff --git a/src/libsync/comm/select.rs b/src/libsync/comm/select.rs index 230bca624f5..737a4bfe299 100644 --- a/src/libsync/comm/select.rs +++ b/src/libsync/comm/select.rs @@ -54,7 +54,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::cell::Cell; use core::kinds::marker; use core::mem; diff --git a/src/libsync/comm/shared.rs b/src/libsync/comm/shared.rs index 5ad4dea5d2a..d13b2c32978 100644 --- a/src/libsync/comm/shared.rs +++ b/src/libsync/comm/shared.rs @@ -20,7 +20,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::cmp; use core::int; use rustrt::local::Local; diff --git a/src/libsync/comm/stream.rs b/src/libsync/comm/stream.rs index 6f337f17309..9747c207a22 100644 --- a/src/libsync/comm/stream.rs +++ b/src/libsync/comm/stream.rs @@ -19,7 +19,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::cmp; use core::int; use rustrt::local::Local; diff --git a/src/libsync/comm/sync.rs b/src/libsync/comm/sync.rs index 4d54df2fc19..cc3c2197c13 100644 --- a/src/libsync/comm/sync.rs +++ b/src/libsync/comm/sync.rs @@ -35,7 +35,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use collections::Vec; use collections::Collection; use core::mem; diff --git a/src/libsync/deque.rs b/src/libsync/deque.rs index 8d2192aeb53..913a58010d4 100644 --- a/src/libsync/deque.rs +++ b/src/libsync/deque.rs @@ -54,7 +54,7 @@ use core::prelude::*; use alloc::arc::Arc; use alloc::heap::{allocate, deallocate}; -use alloc::owned::Box; +use alloc::boxed::Box; use collections::Vec; use core::kinds::marker; use core::mem::{forget, min_align_of, size_of, transmute}; diff --git a/src/libsync/mpsc_queue.rs b/src/libsync/mpsc_queue.rs index ecd37e68880..759695fe5b6 100644 --- a/src/libsync/mpsc_queue.rs +++ b/src/libsync/mpsc_queue.rs @@ -42,7 +42,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::mem; use core::ty::Unsafe; diff --git a/src/libsync/mutex.rs b/src/libsync/mutex.rs index a10ec745869..990d743465d 100644 --- a/src/libsync/mutex.rs +++ b/src/libsync/mutex.rs @@ -59,7 +59,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::atomics; use core::kinds::marker; use core::mem; diff --git a/src/libsync/spsc_queue.rs b/src/libsync/spsc_queue.rs index 2834d404c18..cf4d3222ed0 100644 --- a/src/libsync/spsc_queue.rs +++ b/src/libsync/spsc_queue.rs @@ -37,7 +37,7 @@ use core::prelude::*; -use alloc::owned::Box; +use alloc::boxed::Box; use core::mem; use core::ty::Unsafe; |
