auto merge of #8419 : cmr/rust/fix-rtdebug, r=brson

It now actually does logging, and is compiled out when `--cfg rtdebug` is not
given to the libstd build, which it isn't by default. This makes the rt
benchmarks 18-50% faster.

1 files changed, 4 insertions, 12 deletions

diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 04058887970..89c7b294512 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -16,20 +16,12 @@ macro_rules! rterrln (
     } )
 )
 
-// Some basic logging
-macro_rules! rtdebug_ (
-    ($( $arg:expr),+) => ( {
-        rterrln!( $($arg),+ )
-    } )
-)
-
-// An alternate version with no output, for turning off logging. An
-// earlier attempt that did not call the fmt! macro was insufficient,
-// as a case of the "let bind each variable" approach eventually
-// failed without an error message describing the invocation site.
+// Some basic logging. Enabled by passing `--cfg rtdebug` to the libstd build.
 macro_rules! rtdebug (
     ($( $arg:expr),+) => ( {
-        let _x = fmt!( $($arg),+ );
+        if cfg!(rtdebug) {
+            rterrln!( $($arg),+ )
+        }
     })
 )