From ffb2f12ed89213f96561dfbece0751ac870e2c40 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Sat, 24 May 2014 21:15:16 -0700 Subject: [PATCH] Use phase(plugin) in bootstrap crates Do this to avoid warnings on post-stage0 builds. --- src/compiletest/compiletest.rs | 10 ++++++++-- src/liballoc/lib.rs | 12 ++++++++++-- src/libcollections/lib.rs | 16 +++++++++++++--- src/libflate/lib.rs | 3 ++- src/libgetopts/lib.rs | 3 ++- src/librand/lib.rs | 19 +++++++++++++++++-- src/librustc/lib.rs | 5 +++++ src/librustdoc/lib.rs | 10 ++++++++-- src/librustrt/lib.rs | 10 +++++++++- src/libserialize/lib.rs | 6 ++++++ src/libstd/lib.rs | 3 ++- src/libsync/lib.rs | 5 ++++- src/libsyntax/lib.rs | 7 +++++++ src/libterm/lib.rs | 3 ++- src/libtime/lib.rs | 4 +++- 15 files changed, 98 insertions(+), 18 deletions(-) diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 8fcad94ee1c..de0ca4971f5 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -18,11 +18,17 @@ extern crate test; extern crate getopts; -#[phase(link, syntax)] -extern crate log; extern crate green; extern crate rustuv; +#[cfg(stage0)] +#[phase(syntax, link)] +extern crate log; + +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate log; + extern crate regex; use std::os; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index ca7ed6f4ba0..7e2c9a75fad 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -70,8 +70,14 @@ #![no_std] #![feature(phase)] +#[cfg(stage0)] #[phase(syntax, link)] extern crate core; + +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate core; + extern crate libc; @@ -80,8 +86,10 @@ #[cfg(test)] extern crate debug; #[cfg(test)] extern crate sync; #[cfg(test)] extern crate native; -#[cfg(test)] #[phase(syntax, link)] extern crate std; -#[cfg(test)] #[phase(syntax, link)] extern crate log; +#[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; // Heaps provided for low-level allocation strategies diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 602ecf39a83..a114755a0ed 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -23,14 +23,24 @@ #![feature(macro_rules, managed_boxes, default_type_params, phase, globs)] #![no_std] -#[phase(syntax, 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)] #[phase(syntax, link)] extern crate std; -#[cfg(test)] #[phase(syntax, link)] extern crate log; + +#[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; use core::prelude::*; diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs index 8bfd2d867c1..8d8fe8ffe8c 100644 --- a/src/libflate/lib.rs +++ b/src/libflate/lib.rs @@ -28,7 +28,8 @@ #![feature(phase)] #![deny(deprecated_owned_vector)] -#[cfg(test)] #[phase(syntax, link)] extern crate log; +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; extern crate libc; diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 10584223486..dec62265516 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -91,7 +91,8 @@ #![deny(deprecated_owned_vector)] #[cfg(test)] extern crate debug; -#[cfg(test)] #[phase(syntax, link)] extern crate log; +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; use std::cmp::PartialEq; use std::result::{Err, Ok}; diff --git a/src/librand/lib.rs b/src/librand/lib.rs index 7a12dcf9f7f..1f7216fc1a3 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -28,13 +28,28 @@ #![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)] extern crate native; #[cfg(test)] extern crate debug; -#[cfg(test)] #[phase(syntax, link)] extern crate std; -#[cfg(test)] #[phase(syntax, link)] extern crate log; use core::prelude::*; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index b82dace62ef..bdbb1a98ac5 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -42,9 +42,14 @@ extern crate syntax; extern crate time; +#[cfg(stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate log; + pub mod middle { pub mod def; pub mod trans; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index e623d54675c..05875f59fbe 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -19,8 +19,6 @@ extern crate debug; extern crate getopts; extern crate libc; -#[phase(syntax, link)] -extern crate log; extern crate rustc; extern crate serialize; extern crate sync; @@ -28,6 +26,14 @@ extern crate testing = "test"; extern crate time; +#[cfg(stage0)] +#[phase(syntax, link)] +extern crate log; + +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate log; + use std::io; use std::io::{File, MemWriter}; use std::str; diff --git a/src/librustrt/lib.rs b/src/librustrt/lib.rs index 3158687c6ab..bb57f5c038c 100644 --- a/src/librustrt/lib.rs +++ b/src/librustrt/lib.rs @@ -19,8 +19,14 @@ #![no_std] #![experimental] +#[cfg(stage0)] #[phase(syntax, link)] extern crate core; + +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate core; + extern crate alloc; extern crate libc; extern crate collections; @@ -28,7 +34,9 @@ #[cfg(test)] extern crate realrustrt = "rustrt"; #[cfg(test)] extern crate test; #[cfg(test)] extern crate native; -#[cfg(test)] #[phase(syntax, link)] extern crate std; + +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std; +#[cfg(test, not(stage0))] #[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 08348c96333..33d20ed7bcd 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -27,9 +27,15 @@ // test harness access #[cfg(test)] extern crate test; + +#[cfg(stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(not(stage0))] +#[phase(plugin, link)] +extern crate log; + pub use self::serialize::{Decoder, Encoder, Decodable, Encodable, DecoderHelpers, EncoderHelpers}; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index fbdbc13e1b4..85813c02d55 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -119,7 +119,8 @@ #[cfg(test)] extern crate native; #[cfg(test)] extern crate green; #[cfg(test)] extern crate debug; -#[cfg(test)] #[phase(syntax, link)] extern crate log; +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(test, not(stage0))] #[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 fc4d5fec5f5..44d17e6fb95 100644 --- a/src/libsync/lib.rs +++ b/src/libsync/lib.rs @@ -25,9 +25,12 @@ #![deny(missing_doc)] -#[cfg(test)] +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(test, not(stage0))] +#[phase(plugin, link)] extern crate log; + extern crate alloc; pub use comm::{DuplexStream, duplex}; diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 7fe67ad6f87..754518f5fea 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -32,8 +32,15 @@ extern crate serialize; extern crate term; + +#[cfg(stage0)] #[phase(syntax, link)] extern crate log; + +#[cfg(not(stage0))] +#[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 cc813262576..76118f642ab 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -52,7 +52,8 @@ #![deny(missing_doc)] -#[phase(syntax, link)] extern crate log; +#[cfg(stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(not(stage0))] #[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 f087b9289c3..f2af5943335 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -23,7 +23,9 @@ #![deny(deprecated_owned_vector)] #[cfg(test)] extern crate debug; -#[cfg(test)] #[phase(syntax, link)] extern crate log; + +#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log; +#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log; extern crate serialize; extern crate libc; -- GitLab