auto merge of #5484 : pcwalton/rust/snapshots, r=pcwalton

3 files changed, 0 insertions, 51 deletions

diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 255e1966f37..692a7947e20 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -108,9 +108,6 @@ pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
 
 // Add an inherent method so that imports of GenericChan are not
 // required.
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> Chan<T> {
     fn send(&self, x: T) { chan_send(self, x) }
     fn try_send(&self, x: T) -> bool { chan_try_send(self, x) }
@@ -148,9 +145,6 @@ fn chan_try_send<T:Owned>(self: &Chan<T>, x: T) -> bool {
 }
 
 // Use an inherent impl so that imports are not required:
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> Port<T> {
     fn recv(&self) -> T { port_recv(self) }
     fn try_recv(&self) -> Option<T> { port_try_recv(self) }
@@ -226,9 +220,6 @@ pub fn PortSet<T: Owned>() -> PortSet<T>{
 }
 
 // Use an inherent impl so that imports are not required:
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T:Owned> PortSet<T> {
     fn recv(&self) -> T { port_set_recv(self) }
     fn try_recv(&self) -> Option<T> { port_set_try_recv(self) }
@@ -302,9 +293,6 @@ pure fn port_set_peek<T:Owned>(self: &PortSet<T>) -> bool {
 /// A channel that can be shared between many senders.
 pub type SharedChan<T> = unstable::Exclusive<Chan<T>>;
 
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 pub impl<T: Owned> SharedChan<T> {
     fn send(&self, x: T) { shared_chan_send(self, x) }
     fn try_send(&self, x: T) -> bool { shared_chan_try_send(self, x) }
diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 1f7d05060c4..080b9893345 100644
--- a/src/libcore/core.rc
+++ b/src/libcore/core.rc
@@ -212,34 +212,10 @@ pub use to_str::ToStr;
 pub use clone::Clone;
 
 
-/*
- * Export the log levels as global constants. Higher levels mean
- * more-verbosity. Error is the bottom level, default logging level is
- * warn-and-below.
- */
-/// The error log level
-#[cfg(stage0)]
-pub const error : u32 = 1_u32;
-/// The warning log level
-#[cfg(stage0)]
-pub const warn : u32 = 2_u32;
-/// The info log level
-#[cfg(stage0)]
-pub const info : u32 = 3_u32;
-/// The debug log level
-#[cfg(stage0)]
-pub const debug : u32 = 4_u32;
-
-
 /* Unsupported interfaces */
 
 // Private APIs
 pub mod unstable;
-// NOTE: Remove after snapshot
-#[cfg(stage0)]
-pub mod private {
-    pub use super::unstable::extfmt;
-}
 
 /* For internal use, not exported */
 
@@ -255,15 +231,6 @@ pub mod rt;
 // can be resolved within libcore.
 #[doc(hidden)]
 pub mod core {
-    #[cfg(stage0)]
-    pub const error : u32 = 1_u32;
-    #[cfg(stage0)]
-    pub const warn : u32 = 2_u32;
-    #[cfg(stage0)]
-    pub const info : u32 = 3_u32;
-    #[cfg(stage0)]
-    pub const debug : u32 = 4_u32;
-
     pub use cmp;
     pub use condition;
     pub use option;
diff --git a/src/libcore/io.rs b/src/libcore/io.rs
index e77dc0bbc78..b160da359f8 100644
--- a/src/libcore/io.rs
+++ b/src/libcore/io.rs
@@ -75,9 +75,6 @@ pub trait Reader {
     fn tell(&self) -> uint;
 }
 
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 impl Reader for @Reader {
     fn read(&self, bytes: &mut [u8], len: uint) -> uint {
         self.read(bytes, len)
@@ -658,9 +655,6 @@ pub trait Writer {
     fn get_type(&self) -> WriterType;
 }
 
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
 impl Writer for @Writer {
     fn write(&self, v: &[const u8]) { self.write(v) }
     fn seek(&self, a: int, b: SeekStyle) { self.seek(a, b) }