Auto merge of #32009 - alexcrichton:trim-fulldeps, r=brson

mk: Distribute fewer TARGET_CRATES

Right now everything in TARGET_CRATES is built by default for all non-fulldeps
tests and is distributed by default for all target standard library packages.
Currenly this includes a number of unstable crates which are rarely used such as
`graphviz` and `rbml`>

This commit trims down the set of `TARGET_CRATES`, moves a number of tests to
`*-fulldeps` as a result, and trims down the dependencies of libtest so we can
distribute fewer crates in the `rust-std` packages.

36 files changed, 3 insertions, 48 deletions

diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 300142d5ec1..0293d5402c4 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -92,16 +92,13 @@
 #![feature(unsize)]
 
 #![cfg_attr(not(test), feature(raw, fn_traits, placement_new_protocol))]
-#![cfg_attr(test, feature(test, rustc_private, box_heap))]
+#![cfg_attr(test, feature(test, box_heap))]
 
 // Allow testing this library
 
 #[cfg(test)]
 #[macro_use]
 extern crate std;
-#[cfg(test)]
-#[macro_use]
-extern crate log;
 
 // Heaps provided for low-level allocation strategies
 
diff --git a/src/libcollectionstest/lib.rs b/src/libcollectionstest/lib.rs
index eed530d8b61..f52ed8ff43d 100644
--- a/src/libcollectionstest/lib.rs
+++ b/src/libcollectionstest/lib.rs
@@ -23,7 +23,6 @@
 #![feature(iter_arith)]
 #![feature(pattern)]
 #![feature(rand)]
-#![feature(rustc_private)]
 #![feature(set_recovery)]
 #![feature(slice_bytes)]
 #![feature(step_by)]
@@ -33,8 +32,6 @@
 #![feature(unboxed_closures)]
 #![feature(unicode)]
 
-#[macro_use] extern crate log;
-
 extern crate collections;
 extern crate test;
 extern crate rustc_unicode;
diff --git a/src/libcollectionstest/str.rs b/src/libcollectionstest/str.rs
index 462700318d7..776d73ef10f 100644
--- a/src/libcollectionstest/str.rs
+++ b/src/libcollectionstest/str.rs
@@ -626,8 +626,6 @@ fn vec_str_conversions() {
     while i < n1 {
         let a: u8 = s1.as_bytes()[i];
         let b: u8 = s2.as_bytes()[i];
-        debug!("{}", a);
-        debug!("{}", b);
         assert_eq!(a, b);
         i += 1;
     }
diff --git a/src/libcollectionstest/vec_deque.rs b/src/libcollectionstest/vec_deque.rs
index 742205df8d7..95675a2423e 100644
--- a/src/libcollectionstest/vec_deque.rs
+++ b/src/libcollectionstest/vec_deque.rs
@@ -45,10 +45,6 @@ fn test_simple() {
     assert_eq!(d.len(), 3);
     d.push_front(1);
     assert_eq!(d.len(), 4);
-    debug!("{}", d[0]);
-    debug!("{}", d[1]);
-    debug!("{}", d[2]);
-    debug!("{}", d[3]);
     assert_eq!(d[0], 1);
     assert_eq!(d[1], 2);
     assert_eq!(d[2], 3);
diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
index fe059076926..884f4490d9f 100644
--- a/src/libgetopts/lib.rs
+++ b/src/libgetopts/lib.rs
@@ -92,11 +92,6 @@
 #![deny(missing_docs)]
 #![feature(staged_api)]
 #![feature(str_char)]
-#![cfg_attr(test, feature(rustc_private))]
-
-#[cfg(test)]
-#[macro_use]
-extern crate log;
 
 use self::Name::*;
 use self::HasArg::*;
@@ -1544,8 +1539,6 @@ Options:
 
         let generated_usage = usage("Usage: fruits", &optgroups);
 
-        debug!("expected: <<{}>>", expected);
-        debug!("generated: <<{}>>", generated_usage);
         assert_eq!(generated_usage, expected);
     }
 
@@ -1573,8 +1566,6 @@ Options:
 
         let usage = usage("Usage: fruits", &optgroups);
 
-        debug!("expected: <<{}>>", expected);
-        debug!("generated: <<{}>>", usage);
         assert!(usage == expected)
     }
 
@@ -1601,8 +1592,6 @@ Options:
 
         let usage = usage("Usage: fruits", &optgroups);
 
-        debug!("expected: <<{}>>", expected);
-        debug!("generated: <<{}>>", usage);
         assert!(usage == expected)
     }
 
@@ -1617,8 +1606,6 @@ Options:
         let expected = "Usage: fruits -b VAL [-a VAL] [-k] [-p [VAL]] [-l VAL]..".to_string();
         let generated_usage = short_usage("fruits", &optgroups);
 
-        debug!("expected: <<{}>>", expected);
-        debug!("generated: <<{}>>", generated_usage);
         assert_eq!(generated_usage, expected);
     }
 
diff --git a/src/librand/lib.rs b/src/librand/lib.rs
index 531be63b7bb..e943f861e9d 100644
--- a/src/librand/lib.rs
+++ b/src/librand/lib.rs
@@ -36,16 +36,13 @@
 #![feature(custom_attribute)]
 #![allow(unused_attributes)]
 
-#![cfg_attr(test, feature(test, rand, rustc_private))]
+#![cfg_attr(test, feature(test, rand))]
 
 #![allow(deprecated)]
 
 #[cfg(test)]
 #[macro_use]
 extern crate std;
-#[cfg(test)]
-#[macro_use]
-extern crate log;
 
 use core::f64;
 use core::intrinsics;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index fa07b0f761b..d3a0295c835 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -281,7 +281,6 @@
 #![cfg_attr(not(stage0), deny(warnings))]
 
 #[cfg(test)] extern crate test;
-#[cfg(test)] #[macro_use] extern crate log;
 
 // We want to reexport a few macros from core but libcore has already been
 // imported by the compiler (via our #[no_std] attribute) In this case we just
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index d241cd032ed..39adda1066a 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -173,18 +173,6 @@ macro_rules! select {
     })
 }
 
-// When testing the standard library, we link to the liblog crate to get the
-// logging macros. In doing so, the liblog crate was linked against the real
-// version of libstd, and uses a different std::fmt module than the test crate
-// uses. To get around this difference, we redefine the log!() macro here to be
-// just a dumb version of what it should be.
-#[cfg(test)]
-macro_rules! log {
-    ($lvl:expr, $($args:tt)*) => (
-        if log_enabled!($lvl) { println!($($args)*) }
-    )
-}
-
 #[cfg(test)]
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => ({
diff --git a/src/libtest/Cargo.toml b/src/libtest/Cargo.toml
index 96a84496b9c..ecbd5a9c0f5 100644
--- a/src/libtest/Cargo.toml
+++ b/src/libtest/Cargo.toml
@@ -11,4 +11,3 @@ crate-type = ["dylib", "rlib"]
 [dependencies]
 getopts = { path = "../libgetopts" }
 term = { path = "../libterm" }
-serialize = { path = "../libserialize" }
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 7536ab9c5af..11d2a3e65c8 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -42,8 +42,6 @@
 #![feature(staged_api)]
 
 extern crate getopts;
-extern crate serialize;
-extern crate serialize as rustc_serialize;
 extern crate term;
 extern crate libc;
 
@@ -56,7 +54,6 @@ use self::NamePadding::*;
 use self::OutputLocation::*;
 
 use stats::Stats;
-use serialize::Encodable;
 use std::boxed::FnBox;
 use term::Terminal;
 
@@ -215,7 +212,7 @@ pub struct TestDescAndFn {
     pub testfn: TestFn,
 }
 
-#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Debug, Copy)]
+#[derive(Clone, PartialEq, Debug, Copy)]
 pub struct Metric {
     value: f64,
     noise: f64,
diff --git a/src/test/compile-fail/derive-no-std-not-supported.rs b/src/test/compile-fail-fulldeps/derive-no-std-not-supported.rs
index 01c81a8bbce..01c81a8bbce 100644
--- a/src/test/compile-fail/derive-no-std-not-supported.rs
+++ b/src/test/compile-fail-fulldeps/derive-no-std-not-supported.rs
diff --git a/src/test/compile-fail/dropck_tarena_cycle_checked.rs b/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs
index d36293a484d..d36293a484d 100644
--- a/src/test/compile-fail/dropck_tarena_cycle_checked.rs
+++ b/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs
diff --git a/src/test/compile-fail/dropck_tarena_unsound_drop.rs b/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs
index 6cbed34c7ad..6cbed34c7ad 100644
--- a/src/test/compile-fail/dropck_tarena_unsound_drop.rs
+++ b/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs
diff --git a/src/test/run-pass/conditional-debug-macro-off.rs b/src/test/run-pass-fulldeps/conditional-debug-macro-off.rs
index c6beb5ba358..c6beb5ba358 100644
--- a/src/test/run-pass/conditional-debug-macro-off.rs
+++ b/src/test/run-pass-fulldeps/conditional-debug-macro-off.rs
diff --git a/src/test/run-pass/deprecated-derive.rs b/src/test/run-pass-fulldeps/deprecated-derive.rs
index 69a7f888bbe..69a7f888bbe 100644
--- a/src/test/run-pass/deprecated-derive.rs
+++ b/src/test/run-pass-fulldeps/deprecated-derive.rs
diff --git a/src/test/run-pass/derive-no-std.rs b/src/test/run-pass-fulldeps/derive-no-std.rs
index 78e9da001f7..78e9da001f7 100644
--- a/src/test/run-pass/derive-no-std.rs
+++ b/src/test/run-pass-fulldeps/derive-no-std.rs
diff --git a/src/test/run-pass/deriving-encodable-decodable-box.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
index 328cc134f3b..328cc134f3b 100644
--- a/src/test/run-pass/deriving-encodable-decodable-box.rs
+++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
diff --git a/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
index 6e5eb86c584..6e5eb86c584 100644
--- a/src/test/run-pass/deriving-encodable-decodable-cell-refcell.rs
+++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
diff --git a/src/test/run-pass/deriving-global.rs b/src/test/run-pass-fulldeps/deriving-global.rs
index 10e8ddc41f3..10e8ddc41f3 100644
--- a/src/test/run-pass/deriving-global.rs
+++ b/src/test/run-pass-fulldeps/deriving-global.rs
diff --git a/src/test/run-pass/dropck_tarena_sound_drop.rs b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
index db30bfbf747..db30bfbf747 100644
--- a/src/test/run-pass/dropck_tarena_sound_drop.rs
+++ b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
diff --git a/src/test/run-pass/empty-struct-braces-derive.rs b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
index 8d19209208d..8d19209208d 100644
--- a/src/test/run-pass/empty-struct-braces-derive.rs
+++ b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
diff --git a/src/test/run-pass/extern-mod-syntax.rs b/src/test/run-pass-fulldeps/extern-mod-syntax.rs
index 37404ee7e69..37404ee7e69 100644
--- a/src/test/run-pass/extern-mod-syntax.rs
+++ b/src/test/run-pass-fulldeps/extern-mod-syntax.rs
diff --git a/src/test/run-pass/issue-11881.rs b/src/test/run-pass-fulldeps/issue-11881.rs
index 9da04f72355..9da04f72355 100644
--- a/src/test/run-pass/issue-11881.rs
+++ b/src/test/run-pass-fulldeps/issue-11881.rs
diff --git a/src/test/run-pass/issue-14021.rs b/src/test/run-pass-fulldeps/issue-14021.rs
index 907967d115d..907967d115d 100644
--- a/src/test/run-pass/issue-14021.rs
+++ b/src/test/run-pass-fulldeps/issue-14021.rs
diff --git a/src/test/run-pass/issue-15924.rs b/src/test/run-pass-fulldeps/issue-15924.rs
index 0c208773884..0c208773884 100644
--- a/src/test/run-pass/issue-15924.rs
+++ b/src/test/run-pass-fulldeps/issue-15924.rs
diff --git a/src/test/run-pass/issue-24972.rs b/src/test/run-pass-fulldeps/issue-24972.rs
index ae7eb84d3e8..ae7eb84d3e8 100644
--- a/src/test/run-pass/issue-24972.rs
+++ b/src/test/run-pass-fulldeps/issue-24972.rs
diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass-fulldeps/issue-2804.rs
index a2b4e218a07..a2b4e218a07 100644
--- a/src/test/run-pass/issue-2804.rs
+++ b/src/test/run-pass-fulldeps/issue-2804.rs
diff --git a/src/test/run-pass/issue-4016.rs b/src/test/run-pass-fulldeps/issue-4016.rs
index bc3fa162e02..bc3fa162e02 100644
--- a/src/test/run-pass/issue-4016.rs
+++ b/src/test/run-pass-fulldeps/issue-4016.rs
diff --git a/src/test/run-pass/issue-4036.rs b/src/test/run-pass-fulldeps/issue-4036.rs
index ae7bb8a6842..ae7bb8a6842 100644
--- a/src/test/run-pass/issue-4036.rs
+++ b/src/test/run-pass-fulldeps/issue-4036.rs
diff --git a/src/test/run-pass/logging-enabled-debug.rs b/src/test/run-pass-fulldeps/logging-enabled-debug.rs
index 3ae4884ce47..3ae4884ce47 100644
--- a/src/test/run-pass/logging-enabled-debug.rs
+++ b/src/test/run-pass-fulldeps/logging-enabled-debug.rs
diff --git a/src/test/run-pass/logging-enabled.rs b/src/test/run-pass-fulldeps/logging-enabled.rs
index 2975835a271..2975835a271 100644
--- a/src/test/run-pass/logging-enabled.rs
+++ b/src/test/run-pass-fulldeps/logging-enabled.rs
diff --git a/src/test/run-pass/logging-right-crate.rs b/src/test/run-pass-fulldeps/logging-right-crate.rs
index 7caeeb40124..7caeeb40124 100644
--- a/src/test/run-pass/logging-right-crate.rs
+++ b/src/test/run-pass-fulldeps/logging-right-crate.rs
diff --git a/src/test/run-pass/logging-separate-lines.rs b/src/test/run-pass-fulldeps/logging-separate-lines.rs
index 09759326afd..09759326afd 100644
--- a/src/test/run-pass/logging-separate-lines.rs
+++ b/src/test/run-pass-fulldeps/logging-separate-lines.rs
diff --git a/src/test/run-pass/placement-new-arena.rs b/src/test/run-pass-fulldeps/placement-new-arena.rs
index 7ac624e6814..7ac624e6814 100644
--- a/src/test/run-pass/placement-new-arena.rs
+++ b/src/test/run-pass-fulldeps/placement-new-arena.rs
diff --git a/src/test/run-pass/regions-mock-tcx.rs b/src/test/run-pass-fulldeps/regions-mock-tcx.rs
index ed3cec465ef..ed3cec465ef 100644
--- a/src/test/run-pass/regions-mock-tcx.rs
+++ b/src/test/run-pass-fulldeps/regions-mock-tcx.rs
diff --git a/src/test/run-pass/rust-log-filter.rs b/src/test/run-pass-fulldeps/rust-log-filter.rs
index 306d24e3177..306d24e3177 100644
--- a/src/test/run-pass/rust-log-filter.rs
+++ b/src/test/run-pass-fulldeps/rust-log-filter.rs