diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 12 |
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) => ({ |