From b53e9f17d336bc3550ab2c5eda503bd9e719e94f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 7 Jan 2015 10:27:52 -0800 Subject: Register new snapshots --- src/libstd/io/mod.rs | 3 +-- src/libstd/io/process.rs | 7 ------- src/libstd/lib.rs | 4 ---- src/libstd/path/mod.rs | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 9ef9081bc3c..2595a3c44a8 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1783,9 +1783,8 @@ pub struct UnstableFileStat { } -// NOTE(stage0): change this one last #[doc=..] to /// after the next snapshot bitflags! { - #[doc = "A set of permissions for a file or directory is represented by a set of"] + /// A set of permissions for a file or directory is represented by a set of /// flags which are or'd together. flags FilePermission: u32 { const USER_READ = 0o400, diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 55df6330dd3..879f1192a4a 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -395,13 +395,6 @@ impl Command { } } -#[cfg(stage0)] -impl fmt::Show for Command { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - fmt::String::fmt(self, f) - } -} - impl fmt::String for Command { /// Format the program and arguments of a Command for display. Any /// non-utf8 data is lossily converted using the utf8 replacement diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index eef5bdb60ee..60612f4dbaa 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -108,7 +108,6 @@ #![feature(lang_items, unsafe_destructor)] #![feature(slicing_syntax, unboxed_closures)] #![feature(old_impl_check)] -#![cfg_attr(stage0, allow(unused_attributes))] // Don't link to std. We are std. #![no_std] @@ -152,7 +151,6 @@ pub use core::default; pub use core::finally; pub use core::intrinsics; pub use core::iter; -#[cfg(stage0)] #[cfg(not(test))] pub use core::marker as kinds; #[cfg(not(test))] pub use core::marker; pub use core::mem; #[cfg(not(test))] pub use core::ops; @@ -284,8 +282,6 @@ mod std { pub use vec; // used for vec![] pub use cell; // used for tls! pub use thread_local; // used for thread_local! - #[cfg(stage0)] - pub use marker as kinds; pub use marker; // used for tls! pub use ops; // used for bitflags! diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 581969e98fb..aa59d60d7a4 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -823,7 +823,6 @@ pub struct Display<'a, P:'a> { filename: bool } -//NOTE(stage0): replace with deriving(Show) after snapshot impl<'a, P: GenericPath> fmt::Show for Display<'a, P> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::String::fmt(self, f) -- cgit 1.4.1-3-g733a5