Register new snapshots

5 files changed, 2 insertions, 56 deletions

diff --git a/src/libstd/any.rs b/src/libstd/any.rs
index 7af12bef7b5..965b9ffb95c 100644
--- a/src/libstd/any.rs
+++ b/src/libstd/any.rs
@@ -12,52 +12,13 @@
 //! of any type.
 
 use cast::transmute;
-#[cfg(stage0)]
-use cmp::Eq;
 use option::{Option, Some, None};
-#[cfg(stage0)]
-use to_bytes::{IterBytes, Cb};
 use to_str::ToStr;
 use unstable::intrinsics;
 use util::Void;
-#[cfg(not(stage0))]
 use unstable::intrinsics::TypeId;
 
 ///////////////////////////////////////////////////////////////////////////////
-// TypeId
-///////////////////////////////////////////////////////////////////////////////
-
-/// `TypeId` represents a globally unique identifier for a type
-#[cfg(stage0)]
-pub struct TypeId {
-    priv t: u64,
-}
-
-#[cfg(stage0)]
-impl TypeId {
-    /// Returns the `TypeId` of the type this generic function has been instantiated with
-    #[inline]
-    pub fn of<T: 'static>() -> TypeId {
-        TypeId{ t: unsafe { intrinsics::type_id::<T>() } }
-    }
-}
-
-#[cfg(stage0)]
-impl Eq for TypeId {
-    #[inline]
-    fn eq(&self, &other: &TypeId) -> bool {
-        self.t == other.t
-    }
-}
-
-#[cfg(stage0)]
-impl IterBytes for TypeId {
-    fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool {
-        self.t.iter_bytes(lsb0, f)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // Any trait
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 296091d26e6..6fe757976f0 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -51,7 +51,6 @@
 
 #[comment = "The Rust standard library"];
 #[license = "MIT/ASL2"];
-#[crate_type = "lib"]; // NOTE: remove after stage0 snapshot
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
 
@@ -59,14 +58,13 @@
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, asm, managed_boxes, thread_local)];
+#[feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args)];
 
 // Don't link to std. We are std.
 #[no_std];
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
-#[allow(attribute_usage)]; // NOTE: remove after the next snapshot
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print
 // things and all of the std::io tests have an I/O interface to run on top
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index be1de6c5bdb..d1268d85a43 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -117,11 +117,6 @@ mod kill;
 /// The coroutine task scheduler, built on the `io` event loop.
 pub mod sched;
 
-#[cfg(stage0)]
-pub mod io {
-    pub use io::stdio;
-}
-
 /// The EventLoop and internal synchronous I/O interface.
 pub mod rtio;
 
diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs
index ba4f120f626..8c348d06734 100644
--- a/src/libstd/rtdeps.rs
+++ b/src/libstd/rtdeps.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 //! This module contains the linkage attributes to all runtime dependencies of
-//! the stndard library This varies per-platform, but these libraries are
+//! the standard library This varies per-platform, but these libraries are
 //! necessary for running libstd.
 
 // All platforms need to link to rustrt
@@ -48,7 +48,3 @@ extern {}
 #[link(name = "pthread")]
 #[link(name = "stdc++")]
 extern {}
-
-#[cfg(stage0)]
-#[link_args = "-lstdc++"]
-extern {}
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 01b4225d70b..d3649f0285c 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -313,9 +313,6 @@ extern "rust-intrinsic" {
     /// Gets an identifier which is globally unique to the specified type. This
     /// function will return the same value for a type regardless of whichever
     /// crate it is invoked in.
-    #[cfg(stage0)]
-    pub fn type_id<T: 'static>() -> u64;
-    #[cfg(not(stage0))]
     pub fn type_id<T: 'static>() -> TypeId;
 
 
@@ -504,7 +501,6 @@ pub struct TypeId {
 #[cfg(not(test))]
 impl TypeId {
     /// Returns the `TypeId` of the type this generic function has been instantiated with
-    #[cfg(not(stage0))]
     pub fn of<T: 'static>() -> TypeId {
         unsafe { type_id::<T>() }
     }