Skip to content

Commit db11184

Browse files
committed
std: Move unstable::stack to rt::stack
1 parent 96b299e commit db11184

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

src/libgreen/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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;
15+
use std::rt::stack;
1616
use std::raw;
1717

1818
// FIXME #7761: Registers is boxed so that it is 16-byte aligned, for storing

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/libstd/rt/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ pub mod args;
128128
// Support for running procedures when a program has exited.
129129
mod at_exit_imp;
130130

131+
// Stack overflow protection
132+
pub mod stack;
133+
131134
/// The default error code of the rust runtime if the main task fails instead
132135
/// of exiting cleanly.
133136
pub static DEFAULT_ERROR_CODE: int = 101;
File renamed without changes.

src/libstd/rt/thread.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static DEFAULT_STACK_SIZE: uint = 1024 * 1024;
4141
// and invoke it.
4242
#[no_split_stack]
4343
extern fn thread_start(main: *libc::c_void) -> imp::rust_thread_return {
44-
use unstable::stack;
44+
use rt::stack;
4545
unsafe {
4646
stack::record_stack_bounds(0, uint::MAX);
4747
let f: ~proc() = cast::transmute(main);
@@ -150,7 +150,7 @@ mod imp {
150150
use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, SIZE_T, BOOL,
151151
LPVOID, DWORD, LPDWORD, HANDLE};
152152
use ptr;
153-
use unstable::stack::RED_ZONE;
153+
use rt::stack::RED_ZONE;
154154

155155
pub type rust_thread = HANDLE;
156156
pub type rust_thread_return = DWORD;
@@ -208,7 +208,7 @@ mod imp {
208208
use mem;
209209
use os;
210210
use ptr;
211-
use unstable::stack::RED_ZONE;
211+
use rt::stack::RED_ZONE;
212212

213213
pub type rust_thread = libc::pthread_t;
214214
pub type rust_thread_return = *u8;

src/libstd/unstable/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub mod finally;
1919
pub mod simd;
2020
pub mod sync;
2121
pub mod mutex;
22-
pub mod stack;
2322

2423
/**
2524

0 commit comments

Comments
 (0)