auto merge of #10230 : alexcrichton/rust/snapshots, r=brson

Closes #2240

3 files changed, 0 insertions, 38 deletions

diff --git a/src/libstd/std.rs b/src/libstd/std.rs
index 018180c85b7..4500bae4c90 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@ -181,9 +181,6 @@ pub mod os;
 pub mod path;
 pub mod rand;
 pub mod run;
-// NOTE: Remove module after next snapshot
-#[cfg(stage0)]
-pub mod sys;
 pub mod cast;
 pub mod fmt;
 pub mod repr;
@@ -229,9 +226,6 @@ mod std {
     pub use os;
     pub use rt;
     pub use str;
-    // NOTE: Remove import after next snapshot
-    #[cfg(stage0)]
-    pub use sys;
     pub use to_bytes;
     pub use to_str;
     pub use unstable;
diff --git a/src/libstd/sys.rs b/src/libstd/sys.rs
deleted file mode 100644
index 4216f91b602..00000000000
--- a/src/libstd/sys.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Misc low level stuff
-
-// NOTE: Remove this module after an snapshot
-
-#[allow(missing_doc)];
-
-use any::Any;
-use kinds::Send;
-use rt::task;
-
-pub trait FailWithCause {
-    fn fail_with(cause: Self, file: &'static str, line: uint) -> !;
-}
-
-impl<T: Any + Send> FailWithCause for T {
-    fn fail_with(msg: T, file: &'static str, line: uint) -> ! {
-        task::begin_unwind(msg, file, line)
-    }
-}
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 20563718a6c..9d3e3446a4b 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -75,9 +75,6 @@ pub struct TyDesc {
 #[cfg(not(test))]
 pub enum Opaque { }
 
-#[cfg(stage0)]
-pub type Disr = int;
-#[cfg(not(stage0))]
 pub type Disr = u64;
 
 #[lang="ty_visitor"]