diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2015-01-28 08:13:31 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2015-01-29 07:49:02 -0500 |
| commit | 92e966e099421654c3a76c6cb39f6b9dd6eececc (patch) | |
| tree | 48a24a596351715d9ff801789ff254a3fae6441d | |
| parent | 16a2503a1c4c99a50ceea148d56dc8a6309be048 (diff) | |
| download | rust-92e966e099421654c3a76c6cb39f6b9dd6eececc.tar.gz rust-92e966e099421654c3a76c6cb39f6b9dd6eececc.zip | |
register snaphots
| -rw-r--r-- | src/compiletest/common.rs | 14 | ||||
| -rw-r--r-- | src/compiletest/compiletest.rs | 1 | ||||
| -rw-r--r-- | src/libcore/any.rs | 1 | ||||
| -rw-r--r-- | src/libcore/fmt/mod.rs | 7 | ||||
| -rw-r--r-- | src/libcore/intrinsics.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/mod.rs | 2 | ||||
| -rw-r--r-- | src/snapshots.txt | 9 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-17999.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/liveness-unused.rs | 1 |
9 files changed, 10 insertions, 30 deletions
diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs index 40e123e5323..b1deb8a36ad 100644 --- a/src/compiletest/common.rs +++ b/src/compiletest/common.rs @@ -12,20 +12,6 @@ pub use self::Mode::*; use std::fmt; use std::str::FromStr; -#[cfg(stage0)] // NOTE: remove impl after snapshot -#[derive(Clone, Copy, PartialEq, Show)] -pub enum Mode { - CompileFail, - RunFail, - RunPass, - RunPassValgrind, - Pretty, - DebugInfoGdb, - DebugInfoLldb, - Codegen -} - -#[cfg(not(stage0))] // NOTE: remove cfg after snapshot #[derive(Clone, Copy, PartialEq, Debug)] pub enum Mode { CompileFail, diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 72966d835a6..357ccec7cf3 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -23,6 +23,7 @@ #![feature(os)] #![feature(unicode)] +#![allow(unstable)] #![deny(warnings)] extern crate test; diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 87030ed778d..858808dd6ba 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -166,7 +166,6 @@ impl Any { /// /// A `TypeId` is currently only available for types which ascribe to `'static`, /// but this limitation may be removed in the future. -#[cfg_attr(stage0, lang = "type_id")] #[derive(Clone, Copy, PartialEq, Eq, Show, Hash)] #[stable(feature = "rust1", since = "1.0.0")] pub struct TypeId { diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index fddb0248c2e..50021c668d5 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -32,9 +32,6 @@ pub use self::num::radix; pub use self::num::Radix; pub use self::num::RadixFmt; -#[cfg(stage0)] pub use self::Debug as Show; -#[cfg(stage0)] pub use self::Display as String; - mod num; mod float; pub mod rt; @@ -243,7 +240,6 @@ impl<'a> Display for Arguments<'a> { #[unstable(feature = "core", reason = "I/O and core have yet to be reconciled")] #[deprecated(since = "1.0.0", reason = "renamed to Debug")] -#[cfg(not(stage0))] pub trait Show { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; @@ -261,7 +257,6 @@ pub trait Debug { fn fmt(&self, &mut Formatter) -> Result; } -#[cfg(not(stage0))] impl<T: Show + ?Sized> Debug for T { #[allow(deprecated)] fn fmt(&self, f: &mut Formatter) -> Result { Show::fmt(self, f) } @@ -271,7 +266,6 @@ impl<T: Show + ?Sized> Debug for T { /// used. It corresponds to the default format, `{}`. #[unstable(feature = "core")] #[deprecated(since = "1.0.0", reason = "renamed to Display")] -#[cfg(not(stage0))] pub trait String { /// Formats the value using the given formatter. fn fmt(&self, &mut Formatter) -> Result; @@ -288,7 +282,6 @@ pub trait Display { fn fmt(&self, &mut Formatter) -> Result; } -#[cfg(not(stage0))] impl<T: String + ?Sized> Display for T { #[allow(deprecated)] fn fmt(&self, f: &mut Formatter) -> Result { String::fmt(self, f) } diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index dd6b1e7b4e8..125e8a0e814 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -197,12 +197,8 @@ extern "rust-intrinsic" { pub fn pref_align_of<T>() -> uint; /// Get a static pointer to a type descriptor. - #[cfg(not(stage0))] pub fn get_tydesc<T: ?Sized>() -> *const TyDesc; - #[cfg(stage0)] - pub fn get_tydesc<T>() -> *const TyDesc; - /// 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. diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index ddec517a78e..2b7a44c1727 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -107,8 +107,6 @@ pub fn expand_meta_derive(cx: &mut ExtCtxt, "Rand" => expand!(rand::expand_deriving_rand), - // NOTE(stage0): remove "Show" - "Show" => expand!(show::expand_deriving_show), "Debug" => expand!(show::expand_deriving_show), "Default" => expand!(default::expand_deriving_default), diff --git a/src/snapshots.txt b/src/snapshots.txt index 8b502785733..8d3ab53ef7f 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,12 @@ +S 2015-01-27 7774359 + freebsd-x86_64 63623b632d4f9c33ad3b3cfaeebf8e2dd8395c96 + linux-i386 937b0b126aade54dc2c7198cad67f40d711b64ba + linux-x86_64 3a0ed2a90e1e8b3ee7d81ac7d2feddda0b359c9c + macos-i386 3dbed5c058661cab4ece146fb76acd35cc4d333b + macos-x86_64 fc776bc6b9b60cbd25f07fad43e0f01c76663542 + winnt-i386 77ed0484b6ceb53e5ffa50028d986af8b09a0441 + winnt-x86_64 db1ee5b7939197958e59fe37ce7e123285be64fb + S 2015-01-20 9006c3c freebsd-x86_64 240b30b33263d175e30f925ed1e1e1a4e553a513 linux-i386 544c2063b8d5035342c705b881b8868244c1e9a1 diff --git a/src/test/compile-fail/issue-17999.rs b/src/test/compile-fail/issue-17999.rs index f336fdbfbed..99cb2ec2c02 100644 --- a/src/test/compile-fail/issue-17999.rs +++ b/src/test/compile-fail/issue-17999.rs @@ -9,7 +9,6 @@ // except according to those terms. #![deny(unused_variables)] -#![feature(core)] fn main() { for _ in 1is..101 { diff --git a/src/test/compile-fail/liveness-unused.rs b/src/test/compile-fail/liveness-unused.rs index ebcf46f7277..6262783dd38 100644 --- a/src/test/compile-fail/liveness-unused.rs +++ b/src/test/compile-fail/liveness-unused.rs @@ -11,7 +11,6 @@ #![deny(unused_variables)] #![deny(unused_assignments)] #![allow(dead_code, non_camel_case_types)] -#![feature(core)] #![feature(os)] fn f1(x: isize) { |
