Skip to content

Commit f8b67e0

Browse files
committed
rollup merge of rust-lang#19198: alexcrichton/snapshots
Primarily including the libnative removal
2 parents 59f9b6a + 1d2f424 commit f8b67e0

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
#[cfg(not(stage0))]
10+
1111
use self::TargetLocation::*;
1212

1313
use common::Config;

src/driver/driver.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![no_start]
12-
1311
#[cfg(rustdoc)]
1412
extern crate "rustdoc" as this;
1513

src/librustc/middle/ty.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2638,11 +2638,6 @@ impl ops::Sub<TypeContents,TypeContents> for TypeContents {
26382638
}
26392639

26402640
impl fmt::Show for TypeContents {
2641-
#[cfg(stage0)]
2642-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
2643-
write!(f, "TypeContents({:t})", self.bits)
2644-
}
2645-
#[cfg(not(stage0))]
26462641
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
26472642
write!(f, "TypeContents({:b})", self.bits)
26482643
}

src/snapshots.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2014-11-21 c9f6d69
2+
freebsd-x86_64 0ef316e7c369177de043e69e964418bd637cbfc0
3+
linux-i386 c8342e762a1720be939ed7c6a39bdaa27892f66f
4+
linux-x86_64 7a7fe6f5ed47b9cc66261f880e166c7c8738b73e
5+
macos-i386 63e8644512bd5665c14389a83d5af564c7c0b103
6+
macos-x86_64 7933ae0e974d1b897806138b7052cb2b4514585f
7+
winnt-i386 94f5e2974e6120945c909753010d73b53cd6ff90
8+
winnt-x86_64 905ffbdd94580854b01dc4e27fdad7e7c8ae18fe
9+
110
S 2014-11-18 9c96a79
211
freebsd-x86_64 22c93a289bdbc886af882b5bb76bfa673d46aa4f
312
linux-i386 999ba4a0dfb70adca628138a7d5f491023621140

src/test/compile-fail/stage0-cmp.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub trait PartialEq for Sized? {
3030
fn eq(&self, other: &Self) -> bool;
3131
}
3232

33-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
3433
#[unstable = "Trait is unstable."]
3534
impl<'a, Sized? T: PartialEq> PartialEq for &'a T {
3635
#[inline]

0 commit comments

Comments
 (0)