diff options
| author | bors <bors@rust-lang.org> | 2014-02-23 02:21:53 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-23 02:21:53 -0800 |
| commit | 551da0615764853153db944063ae2e271414a71b (patch) | |
| tree | 9086a265aa3f85969eb6180566e71a9d991d9e70 /src/libnative | |
| parent | c250c16f81f82a21295e421be7bd47c91d64cb2a (diff) | |
| parent | db111846b58253c723750be280a478ed7d27d879 (diff) | |
| download | rust-551da0615764853153db944063ae2e271414a71b.tar.gz rust-551da0615764853153db944063ae2e271414a71b.zip | |
auto merge of #12311 : brson/rust/unstable, r=alexcrichton
With the stability attributes we can put public-but unstable modules next to others, so this moves `intrinsics` and `raw` out of the `unstable` module (and marks both as `#[experimental]`).
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/pipe_unix.rs | 2 | ||||
| -rw-r--r-- | src/libnative/io/pipe_win32.rs | 2 | ||||
| -rw-r--r-- | src/libnative/task.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs index 64acdbf7f48..784d8650689 100644 --- a/src/libnative/io/pipe_unix.rs +++ b/src/libnative/io/pipe_unix.rs @@ -15,7 +15,7 @@ use std::libc; use std::mem; use std::rt::rtio; use std::sync::arc::UnsafeArc; -use std::unstable::intrinsics; +use std::intrinsics; use super::{IoResult, retry}; use super::file::{keep_going, fd_t}; diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_win32.rs index fc4fc0fa789..e5e9592eb5a 100644 --- a/src/libnative/io/pipe_win32.rs +++ b/src/libnative/io/pipe_win32.rs @@ -90,7 +90,7 @@ use std::os::win32::as_utf16_p; use std::ptr; use std::rt::rtio; use std::sync::arc::UnsafeArc; -use std::unstable::intrinsics; +use std::intrinsics; use super::IoResult; diff --git a/src/libnative/task.rs b/src/libnative/task.rs index b0f063ff06e..ccfc040e7df 100644 --- a/src/libnative/task.rs +++ b/src/libnative/task.rs @@ -23,7 +23,7 @@ use std::rt::thread::Thread; use std::rt; use std::task::TaskOpts; use std::unstable::mutex::NativeMutex; -use std::unstable::stack; +use std::rt::stack; use io; use task; |
