Skip to content

Commit 717bbbe

Browse files
author
Jorge Aparicio
committed
register snaphots
1 parent 6b2a8c2 commit 717bbbe

File tree

9 files changed

+10
-30
lines changed

9 files changed

+10
-30
lines changed

src/compiletest/common.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@ pub use self::Mode::*;
1212
use std::fmt;
1313
use std::str::FromStr;
1414

15-
#[cfg(stage0)] // NOTE: remove impl after snapshot
16-
#[derive(Clone, Copy, PartialEq, Show)]
17-
pub enum Mode {
18-
CompileFail,
19-
RunFail,
20-
RunPass,
21-
RunPassValgrind,
22-
Pretty,
23-
DebugInfoGdb,
24-
DebugInfoLldb,
25-
Codegen
26-
}
27-
28-
#[cfg(not(stage0))] // NOTE: remove cfg after snapshot
2915
#[derive(Clone, Copy, PartialEq, Debug)]
3016
pub enum Mode {
3117
CompileFail,

src/compiletest/compiletest.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#![feature(os)]
2424
#![feature(unicode)]
2525

26+
#![allow(unstable)]
2627
#![deny(warnings)]
2728

2829
extern crate test;

src/libcore/any.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ impl Any {
166166
///
167167
/// A `TypeId` is currently only available for types which ascribe to `'static`,
168168
/// but this limitation may be removed in the future.
169-
#[cfg_attr(stage0, lang = "type_id")]
170169
#[derive(Clone, Copy, PartialEq, Eq, Show, Hash)]
171170
#[stable(feature = "rust1", since = "1.0.0")]
172171
pub struct TypeId {

src/libcore/fmt/mod.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ pub use self::num::radix;
3232
pub use self::num::Radix;
3333
pub use self::num::RadixFmt;
3434

35-
#[cfg(stage0)] pub use self::Debug as Show;
36-
#[cfg(stage0)] pub use self::Display as String;
37-
3835
mod num;
3936
mod float;
4037
pub mod rt;
@@ -243,7 +240,6 @@ impl<'a> Display for Arguments<'a> {
243240
#[unstable(feature = "core",
244241
reason = "I/O and core have yet to be reconciled")]
245242
#[deprecated(since = "1.0.0", reason = "renamed to Debug")]
246-
#[cfg(not(stage0))]
247243
pub trait Show {
248244
/// Formats the value using the given formatter.
249245
fn fmt(&self, &mut Formatter) -> Result;
@@ -261,7 +257,6 @@ pub trait Debug {
261257
fn fmt(&self, &mut Formatter) -> Result;
262258
}
263259

264-
#[cfg(not(stage0))]
265260
impl<T: Show + ?Sized> Debug for T {
266261
#[allow(deprecated)]
267262
fn fmt(&self, f: &mut Formatter) -> Result { Show::fmt(self, f) }
@@ -271,7 +266,6 @@ impl<T: Show + ?Sized> Debug for T {
271266
/// used. It corresponds to the default format, `{}`.
272267
#[unstable(feature = "core")]
273268
#[deprecated(since = "1.0.0", reason = "renamed to Display")]
274-
#[cfg(not(stage0))]
275269
pub trait String {
276270
/// Formats the value using the given formatter.
277271
fn fmt(&self, &mut Formatter) -> Result;
@@ -288,7 +282,6 @@ pub trait Display {
288282
fn fmt(&self, &mut Formatter) -> Result;
289283
}
290284

291-
#[cfg(not(stage0))]
292285
impl<T: String + ?Sized> Display for T {
293286
#[allow(deprecated)]
294287
fn fmt(&self, f: &mut Formatter) -> Result { String::fmt(self, f) }

src/libcore/intrinsics.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,8 @@ extern "rust-intrinsic" {
197197
pub fn pref_align_of<T>() -> uint;
198198

199199
/// Get a static pointer to a type descriptor.
200-
#[cfg(not(stage0))]
201200
pub fn get_tydesc<T: ?Sized>() -> *const TyDesc;
202201

203-
#[cfg(stage0)]
204-
pub fn get_tydesc<T>() -> *const TyDesc;
205-
206202
/// Gets an identifier which is globally unique to the specified type. This
207203
/// function will return the same value for a type regardless of whichever
208204
/// crate it is invoked in.

src/libsyntax/ext/deriving/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ pub fn expand_meta_derive(cx: &mut ExtCtxt,
107107

108108
"Rand" => expand!(rand::expand_deriving_rand),
109109

110-
// NOTE(stage0): remove "Show"
111-
"Show" => expand!(show::expand_deriving_show),
112110
"Debug" => expand!(show::expand_deriving_show),
113111

114112
"Default" => expand!(default::expand_deriving_default),

src/snapshots.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2015-01-27 7774359
2+
freebsd-x86_64 63623b632d4f9c33ad3b3cfaeebf8e2dd8395c96
3+
linux-i386 937b0b126aade54dc2c7198cad67f40d711b64ba
4+
linux-x86_64 3a0ed2a90e1e8b3ee7d81ac7d2feddda0b359c9c
5+
macos-i386 3dbed5c058661cab4ece146fb76acd35cc4d333b
6+
macos-x86_64 fc776bc6b9b60cbd25f07fad43e0f01c76663542
7+
winnt-i386 77ed0484b6ceb53e5ffa50028d986af8b09a0441
8+
winnt-x86_64 db1ee5b7939197958e59fe37ce7e123285be64fb
9+
110
S 2015-01-20 9006c3c
211
freebsd-x86_64 240b30b33263d175e30f925ed1e1e1a4e553a513
312
linux-i386 544c2063b8d5035342c705b881b8868244c1e9a1

src/test/compile-fail/issue-17999.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![deny(unused_variables)]
12-
#![feature(core)]
1312

1413
fn main() {
1514
for _ in 1is..101 {

src/test/compile-fail/liveness-unused.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![deny(unused_variables)]
1212
#![deny(unused_assignments)]
1313
#![allow(dead_code, non_camel_case_types)]
14-
#![feature(core)]
1514
#![feature(os)]
1615

1716
fn f1(x: isize) {

0 commit comments

Comments
 (0)