diff options
| author | bors <bors@rust-lang.org> | 2013-03-01 19:45:41 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-01 19:45:41 -0800 |
| commit | 10929ed1ca422eeefee133ab39373947551aa62b (patch) | |
| tree | 5b5c422989a91e849cd9280b1276983080193974 /src/libstd | |
| parent | 0fd1b58f236b4fe653d164836e94feebb2972931 (diff) | |
| parent | bcf626812b88f63932c541f81c7f68360e31a7c1 (diff) | |
| download | rust-10929ed1ca422eeefee133ab39373947551aa62b.tar.gz rust-10929ed1ca422eeefee133ab39373947551aa62b.zip | |
auto merge of #5165 : brson/rust/unstable, r=brson
r? This probably isn't controversial, but I want somebody else to sign off on it.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/arc.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync.rs | 2 | ||||
| -rw-r--r-- | src/libstd/uv_global_loop.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs index 69c5026cbd1..ea59d6a54c6 100644 --- a/src/libstd/arc.rs +++ b/src/libstd/arc.rs @@ -20,9 +20,9 @@ use core::cast; use core::cell::Cell; use core::pipes; use core::prelude::*; -use core::private::{SharedMutableState, shared_mutable_state}; -use core::private::{clone_shared_mutable_state}; -use core::private::{get_shared_mutable_state, get_shared_immutable_state}; +use core::unstable::{SharedMutableState, shared_mutable_state}; +use core::unstable::{clone_shared_mutable_state}; +use core::unstable::{get_shared_mutable_state, get_shared_immutable_state}; use core::ptr; use core::task; use core::util; diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 39d3fd569a6..1289bc8e889 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -19,7 +19,7 @@ use core::cell::Cell; use core::option; use core::pipes; use core::prelude::*; -use core::private::{Exclusive, exclusive}; +use core::unstable::{Exclusive, exclusive}; use core::ptr; use core::task; use core::util; diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index 37d9b3221b2..52cfc078bac 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -18,9 +18,9 @@ use uv_iotask::{IoTask, spawn_iotask}; use core::either::{Left, Right}; use core::libc; use core::comm::{Port, Chan, SharedChan, select2i}; -use core::private::global::{global_data_clone_create, +use core::unstable::global::{global_data_clone_create, global_data_clone}; -use core::private::weak_task::weaken_task; +use core::unstable::weak_task::weaken_task; use core::str; use core::task::{task, SingleThreaded, spawn}; use core::task; |
