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/libstd/rt/thread.rs | |
| 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/libstd/rt/thread.rs')
| -rw-r--r-- | src/libstd/rt/thread.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs index b443182c157..7b24c94b518 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -41,7 +41,7 @@ static DEFAULT_STACK_SIZE: uint = 1024 * 1024; // and invoke it. #[no_split_stack] extern fn thread_start(main: *libc::c_void) -> imp::rust_thread_return { - use unstable::stack; + use rt::stack; unsafe { stack::record_stack_bounds(0, uint::MAX); let f: ~proc() = cast::transmute(main); @@ -150,7 +150,7 @@ mod imp { use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, SIZE_T, BOOL, LPVOID, DWORD, LPDWORD, HANDLE}; use ptr; - use unstable::stack::RED_ZONE; + use rt::stack::RED_ZONE; pub type rust_thread = HANDLE; pub type rust_thread_return = DWORD; @@ -208,7 +208,7 @@ mod imp { use mem; use os; use ptr; - use unstable::stack::RED_ZONE; + use rt::stack::RED_ZONE; pub type rust_thread = libc::pthread_t; pub type rust_thread_return = *u8; |
