From f20b1293fcce4e120bd4a57226e0817271cd672c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 11 Jun 2014 18:47:09 -0700 Subject: [PATCH] Register new snapshots --- src/compiletest/compiletest.rs | 9 +-------- src/liballoc/lib.rs | 13 ++----------- src/libcollections/lib.rs | 15 +++------------ src/libflate/lib.rs | 3 +-- src/libgetopts/lib.rs | 3 +-- src/librand/lib.rs | 19 ++----------------- src/librustc/lib.rs | 9 +-------- src/librustdoc/lib.rs | 9 +-------- src/librustrt/lib.rs | 12 ++---------- src/libserialize/lib.rs | 5 ----- src/libstd/gc.rs | 6 ------ src/libstd/lib.rs | 3 +-- src/libsync/lib.rs | 6 +----- src/libsyntax/ext/deriving/mod.rs | 1 - src/libsyntax/ext/quote.rs | 9 --------- src/libsyntax/lib.rs | 9 +-------- src/libterm/lib.rs | 3 +-- src/libtime/lib.rs | 4 +--- src/snapshots.txt | 8 ++++++++ 19 files changed, 27 insertions(+), 119 deletions(-) diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 1d7f36d0fe0..f9c3894e274 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -20,14 +20,7 @@ extern crate getopts; extern crate green; extern crate rustuv; - -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate log; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate log; +#[phase(plugin, link)] extern crate log; extern crate regex; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index fe9fe57bdbd..0d8d25bff20 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -70,25 +70,16 @@ #![no_std] #![feature(phase)] -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate core; - -#[cfg(not(stage0))] #[phase(plugin, link)] extern crate core; - extern crate libc; - // Allow testing this library #[cfg(test)] extern crate debug; #[cfg(test)] extern crate native; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate std; +#[cfg(test)] #[phase(plugin, link)] extern crate log; // Heaps provided for low-level allocation strategies diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 185ca6e361b..fde8dcd0ef5 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -23,24 +23,15 @@ #![feature(macro_rules, managed_boxes, default_type_params, phase, globs)] #![no_std] +#[phase(plugin, link)] extern crate core; extern crate alloc; -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate core; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate core; - #[cfg(test)] extern crate native; #[cfg(test)] extern crate test; #[cfg(test)] extern crate debug; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate std; +#[cfg(test)] #[phase(plugin, link)] extern crate log; use core::prelude::*; diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs index 955f697dce3..c9617f0da1b 100644 --- a/src/libflate/lib.rs +++ b/src/libflate/lib.rs @@ -27,8 +27,7 @@ html_root_url = "http://doc.rust-lang.org/")] #![feature(phase)] -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate log; extern crate libc; diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 5e02e412245..e127000eb07 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -90,8 +90,7 @@ #![deny(missing_doc)] #[cfg(test)] extern crate debug; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate log; use std::cmp::PartialEq; use std::fmt; diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 1f7216fc1a3..5a9b949be25 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -28,26 +28,11 @@ #![no_std] #![experimental] -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate core; - -#[cfg(not(stage0))] #[phase(plugin, link)] extern crate core; -#[cfg(test, stage0)] -#[phase(syntax, link)] extern crate std; - -#[cfg(test, stage0)] -#[phase(syntax, link)] extern crate log; - -#[cfg(test, not(stage0))] -#[phase(plugin, link)] extern crate std; - -#[cfg(test, not(stage0))] -#[phase(plugin, link)] extern crate log; - +#[cfg(test)] #[phase(plugin, link)] extern crate std; +#[cfg(test)] #[phase(plugin, link)] extern crate log; #[cfg(test)] extern crate native; #[cfg(test)] extern crate debug; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 1e39aaa3a5f..680bd667c3f 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -40,14 +40,7 @@ extern crate serialize; extern crate syntax; extern crate time; - -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate log; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate log; +#[phase(plugin, link)] extern crate log; pub mod middle { pub mod def; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index f135e30c4eb..c141e322fbe 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -24,14 +24,7 @@ extern crate syntax; extern crate testing = "test"; extern crate time; - -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate log; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate log; +#[phase(plugin, link)] extern crate log; use std::io; use std::io::{File, MemWriter}; diff --git a/src/librustrt/lib.rs b/src/librustrt/lib.rs index 76cbeef443e..6c754178818 100644 --- a/src/librustrt/lib.rs +++ b/src/librustrt/lib.rs @@ -20,14 +20,7 @@ #![no_std] #![experimental] -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate core; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate core; - +#[phase(plugin, link)] extern crate core; extern crate alloc; extern crate libc; extern crate collections; @@ -36,8 +29,7 @@ #[cfg(test)] extern crate test; #[cfg(test)] extern crate native; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std; +#[cfg(test)] #[phase(plugin, link)] extern crate std; pub use self::util::{Stdio, Stdout, Stderr}; pub use self::unwind::{begin_unwind, begin_unwind_fmt}; diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index 33d20ed7bcd..ad622eace97 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -28,11 +28,6 @@ #[cfg(test)] extern crate test; -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate log; - -#[cfg(not(stage0))] #[phase(plugin, link)] extern crate log; diff --git a/src/libstd/gc.rs b/src/libstd/gc.rs index b57920e002c..e889752f4fc 100644 --- a/src/libstd/gc.rs +++ b/src/libstd/gc.rs @@ -33,9 +33,6 @@ task annihilation. For now, cycles need to be broken manually by using `Rc` \ with a non-owning `Weak` pointer. A tracing garbage collector is planned."] pub struct Gc { - #[cfg(stage0)] - ptr: @T, - #[cfg(not(stage0))] _ptr: *T, marker: marker::NoSend, } @@ -76,9 +73,6 @@ fn cmp(&self, other: &Gc) -> Ordering { (**self).cmp(&**other) } impl Eq for Gc {} impl Deref for Gc { - #[cfg(stage0)] - fn deref<'a>(&'a self) -> &'a T { &*self.ptr } - #[cfg(not(stage0))] fn deref<'a>(&'a self) -> &'a T { &**self } } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 0f7b89338b6..695c61efcf0 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -119,8 +119,7 @@ #[cfg(test)] extern crate native; #[cfg(test)] extern crate green; #[cfg(test)] extern crate debug; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate log; extern crate alloc; extern crate core; diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs index 66ca10b196c..4e8617e48c3 100644 --- a/src/libsync/lib.rs +++ b/src/libsync/lib.rs @@ -30,9 +30,6 @@ #![deny(missing_doc)] #![no_std] -#[cfg(stage0)] -#[phase(syntax, link)] extern crate core; -#[cfg(not(stage0))] #[phase(plugin, link)] extern crate core; extern crate alloc; extern crate collections; @@ -40,8 +37,7 @@ #[cfg(test)] extern crate test; #[cfg(test)] extern crate native; -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std; +#[cfg(test)] #[phase(plugin, link)] extern crate std; pub use alloc::arc::{Arc, Weak}; pub use lock::{Mutex, MutexGuard, Condvar, Barrier, diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index 1833e56dbfb..edfe54db0c7 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -79,7 +79,6 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt, "Encodable" => expand!(encodable::expand_deriving_encodable), "Decodable" => expand!(decodable::expand_deriving_decodable), - // NOTE: after a stage0 snap this needs treatment "PartialEq" => expand!(eq::expand_deriving_eq), "Eq" => expand!(totaleq::expand_deriving_totaleq), "PartialOrd" => expand!(ord::expand_deriving_ord), diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 4f1e2ab356e..6514d8fa418 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -37,17 +37,8 @@ pub mod rt { use parse; use print::pprust; - #[cfg(not(stage0))] use ast::{TokenTree, Generics, Expr}; - // NOTE remove this after snapshot - // (stage0 quasiquoter needs this) - #[cfg(stage0)] - pub use ast::{Generics, TokenTree, TTTok}; - #[cfg(stage0)] - pub use parse::token::{IDENT, SEMI, LBRACE, RBRACE, LIFETIME, COLON, AND, BINOP, EQ, - LBRACKET, RBRACKET, LPAREN, RPAREN, POUND, NOT, MOD_SEP, DOT, COMMA}; - pub use parse::new_parser_from_tts; pub use codemap::{BytePos, Span, dummy_spanned}; diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 754518f5fea..8a66f0e6846 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -32,14 +32,7 @@ extern crate serialize; extern crate term; - -#[cfg(stage0)] -#[phase(syntax, link)] -extern crate log; - -#[cfg(not(stage0))] -#[phase(plugin, link)] -extern crate log; +#[phase(plugin, link)] extern crate log; extern crate fmt_macros; extern crate debug; diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index 76118f642ab..33e61b97420 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -52,8 +52,7 @@ #![deny(missing_doc)] -#[cfg(stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(not(stage0))] #[phase(plugin, link)] extern crate log; +#[phase(plugin, link)] extern crate log; pub use terminfo::TerminfoTerminal; #[cfg(windows)] diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 63523cd3a6f..4cade394105 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -22,9 +22,7 @@ #![feature(phase)] #[cfg(test)] extern crate debug; - -#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; -#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; +#[cfg(test)] #[phase(plugin, link)] extern crate log; extern crate serialize; extern crate libc; diff --git a/src/snapshots.txt b/src/snapshots.txt index 854c60a3f1b..e137b54e54a 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2014-06-11 f9260d4 + freebsd-x86_64 57f155da12e561a277506f999a616ff689a55dcc + linux-i386 df46b5dab3620375d6175c284ea0aeb3f9c6a11e + linux-x86_64 a760c8271ecb850bc802e151c2a321f212edf526 + macos-i386 d6c831717aebd16694fb7e63dca98845e6583378 + macos-x86_64 76932cacbdc2557e51565917a1bb6629b0b4ebc1 + winnt-i386 6285faeac311a9a84db078ab93d299a65abeeea9 + S 2014-05-30 60a43f9 freebsd-x86_64 59067eb9e89bde3e20a1078104f4b1105e4b56fc linux-i386 c1a81811e8e104c91c35d94a140e3cf8463c7655 -- GitLab