diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 8ec3f5133b5..032b2dbe8f1 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -7,7 +7,7 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -#[cfg(not(stage0))] + use self::TargetLocation::*; use common::Config; diff --git a/src/driver/driver.rs b/src/driver/driver.rs index 224b4f1b5c5..632d21d7b9c 100644 --- a/src/driver/driver.rs +++ b/src/driver/driver.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![no_start] - #[cfg(rustdoc)] extern crate "rustdoc" as this; diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index e9319e29555..47b296e46cd 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -2638,11 +2638,6 @@ fn sub(&self, other: &TypeContents) -> TypeContents { } impl fmt::Show for TypeContents { - #[cfg(stage0)] - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "TypeContents({:t})", self.bits) - } - #[cfg(not(stage0))] fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "TypeContents({:b})", self.bits) } diff --git a/src/snapshots.txt b/src/snapshots.txt index c11977f613c..0faf6840f06 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,12 @@ +S 2014-11-21 c9f6d69 + freebsd-x86_64 0ef316e7c369177de043e69e964418bd637cbfc0 + linux-i386 c8342e762a1720be939ed7c6a39bdaa27892f66f + linux-x86_64 7a7fe6f5ed47b9cc66261f880e166c7c8738b73e + macos-i386 63e8644512bd5665c14389a83d5af564c7c0b103 + macos-x86_64 7933ae0e974d1b897806138b7052cb2b4514585f + winnt-i386 94f5e2974e6120945c909753010d73b53cd6ff90 + winnt-x86_64 905ffbdd94580854b01dc4e27fdad7e7c8ae18fe + S 2014-11-18 9c96a79 freebsd-x86_64 22c93a289bdbc886af882b5bb76bfa673d46aa4f linux-i386 999ba4a0dfb70adca628138a7d5f491023621140 diff --git a/src/test/compile-fail/stage0-cmp.rs b/src/test/compile-fail/stage0-cmp.rs index 2c0772b1414..f68eb6400fa 100644 --- a/src/test/compile-fail/stage0-cmp.rs +++ b/src/test/compile-fail/stage0-cmp.rs @@ -30,7 +30,6 @@ pub trait PartialEq for Sized? { fn eq(&self, other: &Self) -> bool; } -#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot #[unstable = "Trait is unstable."] impl<'a, Sized? T: PartialEq> PartialEq for &'a T { #[inline]