Skip to content

Commit f20b129

Browse files
alexcrichtonalexcrichton
committed
Register new snapshots
1 parent d64f18c commit f20b129

File tree

19 files changed

+27
-119
lines changed

19 files changed

+27
-119
lines changed

‎src/compiletest/compiletest.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ extern crate test;
2020
extern crate getopts;
2121
extern crate green;
2222
extern crate rustuv;
23-
24-
#[cfg(stage0)]
25-
#[phase(syntax, link)]
26-
extern crate log;
27-
28-
#[cfg(not(stage0))]
29-
#[phase(plugin, link)]
30-
extern crate log;
23+
#[phase(plugin, link)] extern crate log;
3124

3225
extern crate regex;
3326

‎src/liballoc/lib.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,16 @@
7070
#![no_std]
7171
#![feature(phase)]
7272

73-
#[cfg(stage0)]
74-
#[phase(syntax, link)]
75-
extern crate core;
76-
77-
#[cfg(not(stage0))]
7873
#[phase(plugin, link)]
7974
extern crate core;
80-
8175
extern crate libc;
8276

83-
8477
// Allow testing this library
8578

8679
#[cfg(test)] extern crate debug;
8780
#[cfg(test)] extern crate native;
88-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
89-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
90-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
91-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
81+
#[cfg(test)] #[phase(plugin, link)] extern crate std;
82+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
9283

9384
// Heaps provided for low-level allocation strategies
9485

‎src/libcollections/lib.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,15 @@
2323
#![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]
2424
#![no_std]
2525

26+
#[phase(plugin, link)] extern crate core;
2627
extern crate alloc;
2728

28-
#[cfg(stage0)]
29-
#[phase(syntax, link)]
30-
extern crate core;
31-
32-
#[cfg(not(stage0))]
33-
#[phase(plugin, link)]
34-
extern crate core;
35-
3629
#[cfg(test)] extern crate native;
3730
#[cfg(test)] extern crate test;
3831
#[cfg(test)] extern crate debug;
3932

40-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
41-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
42-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
43-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
33+
#[cfg(test)] #[phase(plugin, link)] extern crate std;
34+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
4435

4536
use core::prelude::*;
4637

‎src/libflate/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
2727
html_root_url = "http://doc.rust-lang.org/")]
2828
#![feature(phase)]
2929

30-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
31-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
30+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
3231

3332
extern crate libc;
3433

‎src/libgetopts/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@
9090
#![deny(missing_doc)]
9191

9292
#[cfg(test)] extern crate debug;
93-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
94-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
93+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
9594

9695
use std::cmp::PartialEq;
9796
use std::fmt;

‎src/librand/lib.rs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,11 @@
2828
#![no_std]
2929
#![experimental]
3030

31-
#[cfg(stage0)]
32-
#[phase(syntax, link)]
33-
extern crate core;
34-
35-
#[cfg(not(stage0))]
3631
#[phase(plugin, link)]
3732
extern crate core;
3833

39-
#[cfg(test, stage0)]
40-
#[phase(syntax, link)] extern crate std;
41-
42-
#[cfg(test, stage0)]
43-
#[phase(syntax, link)] extern crate log;
44-
45-
#[cfg(test, not(stage0))]
46-
#[phase(plugin, link)] extern crate std;
47-
48-
#[cfg(test, not(stage0))]
49-
#[phase(plugin, link)] extern crate log;
50-
34+
#[cfg(test)] #[phase(plugin, link)] extern crate std;
35+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
5136
#[cfg(test)] extern crate native;
5237
#[cfg(test)] extern crate debug;
5338

‎src/librustc/lib.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,7 @@ extern crate libc;
4040
extern crate serialize;
4141
extern crate syntax;
4242
extern crate time;
43-
44-
#[cfg(stage0)]
45-
#[phase(syntax, link)]
46-
extern crate log;
47-
48-
#[cfg(not(stage0))]
49-
#[phase(plugin, link)]
50-
extern crate log;
43+
#[phase(plugin, link)] extern crate log;
5144

5245
pub mod middle {
5346
pub mod def;

‎src/librustdoc/lib.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,7 @@ extern crate serialize;
2424
extern crate syntax;
2525
extern crate testing = "test";
2626
extern crate time;
27-
28-
#[cfg(stage0)]
29-
#[phase(syntax, link)]
30-
extern crate log;
31-
32-
#[cfg(not(stage0))]
33-
#[phase(plugin, link)]
34-
extern crate log;
27+
#[phase(plugin, link)] extern crate log;
3528

3629
use std::io;
3730
use std::io::{File, MemWriter};

‎src/librustrt/lib.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@
2020
#![no_std]
2121
#![experimental]
2222

23-
#[cfg(stage0)]
24-
#[phase(syntax, link)]
25-
extern crate core;
26-
27-
#[cfg(not(stage0))]
28-
#[phase(plugin, link)]
29-
extern crate core;
30-
23+
#[phase(plugin, link)] extern crate core;
3124
extern crate alloc;
3225
extern crate libc;
3326
extern crate collections;
@@ -36,8 +29,7 @@ extern crate collections;
3629
#[cfg(test)] extern crate test;
3730
#[cfg(test)] extern crate native;
3831

39-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
40-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
32+
#[cfg(test)] #[phase(plugin, link)] extern crate std;
4133

4234
pub use self::util::{Stdio, Stdout, Stderr};
4335
pub use self::unwind::{begin_unwind, begin_unwind_fmt};

‎src/libserialize/lib.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ Core encoding and decoding interfaces.
2828
#[cfg(test)]
2929
extern crate test;
3030

31-
#[cfg(stage0)]
32-
#[phase(syntax, link)]
33-
extern crate log;
34-
35-
#[cfg(not(stage0))]
3631
#[phase(plugin, link)]
3732
extern crate log;
3833

‎src/libstd/gc.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ use raw;
3333
task annihilation. For now, cycles need to be broken manually by using `Rc<T>` \
3434
with a non-owning `Weak<T>` pointer. A tracing garbage collector is planned."]
3535
pub struct Gc<T> {
36-
#[cfg(stage0)]
37-
ptr: @T,
38-
#[cfg(not(stage0))]
3936
_ptr: *T,
4037
marker: marker::NoSend,
4138
}
@@ -76,9 +73,6 @@ impl<T: Ord + 'static> Ord for Gc<T> {
7673
impl<T: Eq + 'static> Eq for Gc<T> {}
7774

7875
impl<T: 'static> Deref<T> for Gc<T> {
79-
#[cfg(stage0)]
80-
fn deref<'a>(&'a self) -> &'a T { &*self.ptr }
81-
#[cfg(not(stage0))]
8276
fn deref<'a>(&'a self) -> &'a T { &**self }
8377
}
8478

‎src/libstd/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@
119119
#[cfg(test)] extern crate native;
120120
#[cfg(test)] extern crate green;
121121
#[cfg(test)] extern crate debug;
122-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
123-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
122+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
124123

125124
extern crate alloc;
126125
extern crate core;

‎src/libsync/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@
3030
#![deny(missing_doc)]
3131
#![no_std]
3232

33-
#[cfg(stage0)]
34-
#[phase(syntax, link)] extern crate core;
35-
#[cfg(not(stage0))]
3633
#[phase(plugin, link)] extern crate core;
3734
extern crate alloc;
3835
extern crate collections;
3936
extern crate rustrt;
4037

4138
#[cfg(test)] extern crate test;
4239
#[cfg(test)] extern crate native;
43-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
44-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
40+
#[cfg(test)] #[phase(plugin, link)] extern crate std;
4541

4642
pub use alloc::arc::{Arc, Weak};
4743
pub use lock::{Mutex, MutexGuard, Condvar, Barrier,

‎src/libsyntax/ext/deriving/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,
7979
"Encodable" => expand!(encodable::expand_deriving_encodable),
8080
"Decodable" => expand!(decodable::expand_deriving_decodable),
8181

82-
// NOTE: after a stage0 snap this needs treatment
8382
"PartialEq" => expand!(eq::expand_deriving_eq),
8483
"Eq" => expand!(totaleq::expand_deriving_totaleq),
8584
"PartialOrd" => expand!(ord::expand_deriving_ord),

‎src/libsyntax/ext/quote.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,8 @@ pub mod rt {
3737
use parse;
3838
use print::pprust;
3939

40-
#[cfg(not(stage0))]
4140
use ast::{TokenTree, Generics, Expr};
4241

43-
// NOTE remove this after snapshot
44-
// (stage0 quasiquoter needs this)
45-
#[cfg(stage0)]
46-
pub use ast::{Generics, TokenTree, TTTok};
47-
#[cfg(stage0)]
48-
pub use parse::token::{IDENT, SEMI, LBRACE, RBRACE, LIFETIME, COLON, AND, BINOP, EQ,
49-
LBRACKET, RBRACKET, LPAREN, RPAREN, POUND, NOT, MOD_SEP, DOT, COMMA};
50-
5142
pub use parse::new_parser_from_tts;
5243
pub use codemap::{BytePos, Span, dummy_spanned};
5344

‎src/libsyntax/lib.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@ This API is completely unstable and subject to change.
3232

3333
extern crate serialize;
3434
extern crate term;
35-
36-
#[cfg(stage0)]
37-
#[phase(syntax, link)]
38-
extern crate log;
39-
40-
#[cfg(not(stage0))]
41-
#[phase(plugin, link)]
42-
extern crate log;
35+
#[phase(plugin, link)] extern crate log;
4336

4437
extern crate fmt_macros;
4538
extern crate debug;

‎src/libterm/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252

5353
#![deny(missing_doc)]
5454

55-
#[cfg(stage0)] #[phase(syntax, link)] extern crate log;
56-
#[cfg(not(stage0))] #[phase(plugin, link)] extern crate log;
55+
#[phase(plugin, link)] extern crate log;
5756

5857
pub use terminfo::TerminfoTerminal;
5958
#[cfg(windows)]

‎src/libtime/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
#![feature(phase)]
2323

2424
#[cfg(test)] extern crate debug;
25-
26-
#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
27-
#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
25+
#[cfg(test)] #[phase(plugin, link)] extern crate log;
2826

2927
extern crate serialize;
3028
extern crate libc;

‎src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-06-11 f9260d4
2+
freebsd-x86_64 57f155da12e561a277506f999a616ff689a55dcc
3+
linux-i386 df46b5dab3620375d6175c284ea0aeb3f9c6a11e
4+
linux-x86_64 a760c8271ecb850bc802e151c2a321f212edf526
5+
macos-i386 d6c831717aebd16694fb7e63dca98845e6583378
6+
macos-x86_64 76932cacbdc2557e51565917a1bb6629b0b4ebc1
7+
winnt-i386 6285faeac311a9a84db078ab93d299a65abeeea9
8+
19
S 2014-05-30 60a43f9
210
freebsd-x86_64 59067eb9e89bde3e20a1078104f4b1105e4b56fc
311
linux-i386 c1a81811e8e104c91c35d94a140e3cf8463c7655

0 commit comments

Comments
 (0)