From da118e88d5f5814e5a7fad4dbeb8cc125054c5da Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 22 Mar 2014 07:53:15 -0700 Subject: [PATCH] Snapshot cleanup --- src/compiletest/compiletest.rs | 1 - src/driver/driver.rs | 5 ----- src/libgreen/lib.rs | 10 ---------- src/libnative/lib.rs | 2 +- src/libstd/intrinsics.rs | 1 - 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index e86309f81af..3dd29ff38d1 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -12,7 +12,6 @@ #[feature(phase)]; #[allow(non_camel_case_types)]; -#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0 #[deny(warnings)]; extern crate test; diff --git a/src/driver/driver.rs b/src/driver/driver.rs index 5fd08793ce7..ca462fc7a39 100644 --- a/src/driver/driver.rs +++ b/src/driver/driver.rs @@ -14,9 +14,4 @@ extern crate this = "rustdoc"; #[cfg(rustc)] extern crate this = "rustc"; -#[cfg(not(stage0))] fn main() { this::main() } - -#[cfg(stage0)] -#[start] -fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) } diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs index d586d08bd0d..b9fb424cae8 100644 --- a/src/libgreen/lib.rs +++ b/src/libgreen/lib.rs @@ -207,16 +207,6 @@ pub mod sleeper_list; pub mod stack; pub mod task; -#[lang = "start"] -#[cfg(not(test), stage0)] -pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int { - use std::cast; - start(argc, argv, proc() { - let main: extern "Rust" fn() = unsafe { cast::transmute(main) }; - main(); - }) -} - /// Set up a default runtime configuration, given compiler-supplied arguments. /// /// This function will block until the entire pool of M:N schedulers have diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs index da8f2ea139d..34e85a9819a 100644 --- a/src/libnative/lib.rs +++ b/src/libnative/lib.rs @@ -69,7 +69,7 @@ static OS_DEFAULT_STACK_ESTIMATE: uint = 1 << 20; static OS_DEFAULT_STACK_ESTIMATE: uint = 2 * (1 << 20); #[lang = "start"] -#[cfg(not(test), not(stage0))] +#[cfg(not(test))] pub fn lang_start(main: *u8, argc: int, argv: **u8) -> int { use std::cast; start(argc, argv, proc() { diff --git a/src/libstd/intrinsics.rs b/src/libstd/intrinsics.rs index 78e3df4b6f8..55e7746a44d 100644 --- a/src/libstd/intrinsics.rs +++ b/src/libstd/intrinsics.rs @@ -164,7 +164,6 @@ pub trait TyVisitor { fn visit_self(&mut self) -> bool; } - extern "rust-intrinsic" { // NB: These intrinsics take unsafe pointers because they mutate aliased