Skip to content

Commit 551da06

Browse files
committed
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]`).
2 parents c250c16 + db11184 commit 551da06

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+115
-127
lines changed

src/libarena/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ use std::num;
3737
use std::kinds::marker;
3838
use std::rc::Rc;
3939
use std::rt::global_heap;
40-
use std::unstable::intrinsics::{TyDesc, get_tydesc};
41-
use std::unstable::intrinsics;
40+
use std::intrinsics::{TyDesc, get_tydesc};
41+
use std::intrinsics;
4242
use std::vec;
4343

4444
// The way arena uses arrays is really deeply awful. The arrays are

src/libgreen/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use std::uint;
1212
use std::cast::{transmute, transmute_mut_unsafe,
1313
transmute_region, transmute_mut_region};
1414
use stack::Stack;
15-
use std::unstable::stack;
16-
use std::unstable::raw;
15+
use std::rt::stack;
16+
use std::raw;
1717

1818
// FIXME #7761: Registers is boxed so that it is 16-byte aligned, for storing
1919
// SSE regs. It would be marginally better not to do this. In C++ we

src/libgreen/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ memory and partly incapable of presentation to others.",
124124
abort();
125125

126126
fn abort() -> ! {
127-
use std::unstable::intrinsics;
127+
use std::intrinsics;
128128
unsafe { intrinsics::abort() }
129129
}
130130
}

src/libgreen/sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::rt::task::BlockedTask;
1616
use std::rt::task::Task;
1717
use std::sync::deque;
1818
use std::unstable::mutex::NativeMutex;
19-
use std::unstable::raw;
19+
use std::raw;
2020

2121
use TaskState;
2222
use context::Context;

src/libgreen/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use std::rt::rtio;
2626
use std::rt::task::{Task, BlockedTask, SendMessage};
2727
use std::task::TaskOpts;
2828
use std::unstable::mutex::NativeMutex;
29-
use std::unstable::raw;
29+
use std::raw;
3030

3131
use context::Context;
3232
use coroutine::Coroutine;

src/libnative/io/pipe_unix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::libc;
1515
use std::mem;
1616
use std::rt::rtio;
1717
use std::sync::arc::UnsafeArc;
18-
use std::unstable::intrinsics;
18+
use std::intrinsics;
1919

2020
use super::{IoResult, retry};
2121
use super::file::{keep_going, fd_t};

src/libnative/io/pipe_win32.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ use std::os::win32::as_utf16_p;
9090
use std::ptr;
9191
use std::rt::rtio;
9292
use std::sync::arc::UnsafeArc;
93-
use std::unstable::intrinsics;
93+
use std::intrinsics;
9494

9595
use super::IoResult;
9696

src/libnative/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use std::rt::thread::Thread;
2323
use std::rt;
2424
use std::task::TaskOpts;
2525
use std::unstable::mutex::NativeMutex;
26-
use std::unstable::stack;
26+
use std::rt::stack;
2727

2828
use io;
2929
use task;

src/librustc/back/archive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use std::libc;
2222
use std::os;
2323
use std::run::{ProcessOptions, Process, ProcessOutput};
2424
use std::str;
25-
use std::unstable::raw;
25+
use std::raw;
2626
use extra::tempfile::TempDir;
2727
use syntax::abi;
2828

src/librustdoc/html/markdown.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use std::io;
3232
use std::libc;
3333
use std::mem;
3434
use std::str;
35-
use std::unstable::intrinsics;
35+
use std::intrinsics;
3636
use std::vec;
3737

3838
/// A unit struct which has the `fmt::Show` trait implemented. When

0 commit comments

Comments
 (0)