about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-08 07:34:28 -0800
committerbors <bors@rust-lang.org>2016-03-08 07:34:28 -0800
commiteabfc160f87ccc0b296f49af7fe688506580c473 (patch)
tree3ed43a5ee293a1f947caf5ca8b01d8f648652692 /src/libstd
parent8f0479b2a5fc16814b68efe9e87dddf231b8941d (diff)
parent0d5cfd9117eabab7d3179277ee6b18bb6efb4f11 (diff)
downloadrust-eabfc160f87ccc0b296f49af7fe688506580c473.tar.gz
rust-eabfc160f87ccc0b296f49af7fe688506580c473.zip
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.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
-rw-r--r--src/libstd/macros.rs12
2 files changed, 0 insertions, 13 deletions
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) => ({