Use phase(plugin) in bootstrap crates

Do this to avoid warnings on post-stage0 builds.

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 8fcad94ee1cfc7cff997f61b143426c9c50b7105..de0ca4971f5c2ba085bd1185dcfa5ed6f3f3d38f 100644 (file)
--- 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 ca7ed6f4ba05bda7329cc0139c0138d92de67330..7e2c9a75fad0d3eee0b23ecb3bb5de6dcc776302 100644 (file)
--- 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 602ecf39a836c837374bbe167826a9b4895e0b09..a114755a0ed91a3ac011fd8b6cc8020e8ef3b89c 100644 (file)
--- 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 8bfd2d867c130ad749497202ef0d56b40b62d1c4..8d8fe8ffe8cfe404c10aa577d9cd0f4207bc3cc3 100644 (file)
--- 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 10584223486c00a8dd9a495104727817d5383dc3..dec62265516fdb5da21e4285641a8b105300b9e8 100644 (file)
--- 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 7a12dcf9f7f319ffcf32b049c5b94c352dea6a37..1f7216fc1a37d9e05b6270cf121703edc3e1af3f 100644 (file)
--- 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 b82dace62efff15fe224cb9db8dbd55a9bc83775..bdbb1a98ac5a4fc02ef03c16b25a81642727894e 100644 (file)
--- 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 e623d54675c25c820cddfe898067f9ebca0fe2fb..05875f59fbe1852bb4da502a1cdba1f47aceeb71 100644 (file)
--- 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 3158687c6ab937e04be0b278f4a2252e17eba01f..bb57f5c038c0323c4f111c814f37d427f4dd2f3c 100644 (file)
--- 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 08348c963338265c0812094ac2054a8d6e3ca0be..33d20ed7bcd0fe35313719066df22d713da674e1 100644 (file)
--- 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 fbdbc13e1b430ed1ea95462c2e802e970c6a3a90..85813c02d5535be8c25e49515123caf37260e805 100644 (file)
--- 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 fc4d5fec5f52a06e861232dce288da04ee610a2a..44d17e6fb95ce13bb7d446aa8f3e8e7b556f7119 100644 (file)
--- 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 7fe67ad6f87baeab8c3513d53c5bb9897acc012e..754518f5fea3192f8cd7239757b63f8f38706a89 100644 (file)
--- 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 cc813262576ad9d7d28493a7198b4c434edd048f..76118f642abe0480722ffed527cd58ac3aeb7640 100644 (file)
--- 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 f087b9289c3d723432601ad54e92df23f8a34a4f..f2af59433358e44bc1cfeba8f9fa91b0d87aa169 100644 (file)
--- 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;