auto merge of #9454 : alexcrichton/rust/snapshot, r=thestinger

This commit is contained in:
bors 2013-09-23 21:06:03 -07:00
commit c1b187d41b
9 changed files with 13 additions and 91 deletions

View file

@ -11,12 +11,6 @@
//xfail-fast
#[start]
#[cfg(stage0)]
fn start(_argc: int, _argv: **u8, _crate_map: *u8) -> int {
return 0;
}
#[start]
#[cfg(not(stage0))]
fn start(_argc: int, _argv: **u8) -> int {
return 0;
}

View file

@ -13,14 +13,6 @@
// A simple test of starting the runtime manually
#[start]
#[cfg(stage0)]
fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
do std::rt::start(argc, argv, crate_map) {
info!("creating my own runtime is joy");
}
}
#[start]
#[cfg(not(stage0))]
fn start(argc: int, argv: **u8) -> int {
do std::rt::start(argc, argv) {
info!("creating my own runtime is joy");

View file

@ -11,7 +11,7 @@
// This causes memory corruption in stage0.
// This used to cause memory corruption in stage 0.
enum thing<K> { some(K), }
pub fn main() { let _x = some(~"hi"); }

View file

@ -11,17 +11,6 @@
// xfail-fast
#[start]
#[cfg(stage0)]
fn start(argc: int, argv: **u8, crate_map: *u8) -> int {
do std::rt::start_on_main_thread(argc, argv, crate_map) {
info!("running on main thread");
do spawn {
info!("running on another thread");
}
}
}
#[start]
#[cfg(not(stage0))]
fn start(argc: int, argv: **u8) -> int {
do std::rt::start_on_main_thread(argc, argv) {
info!("running on main thread");