Invert --cfg debug to --cfg ndebug

Many people will be very confused that their debug! statements aren't working
when they first use rust only to learn that they should have been building with
`--cfg debug` the entire time. This inverts the meaning of the flag to instead
of enabling debug statements, now it disables debug statements.

This way the default behavior is a bit more reasonable, and requires less
end-user configuration. Furthermore, this turns on debug by default when
building the rustc compiler.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 0bee7895420..82d452bc734 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -715,7 +715,7 @@ pub fn std_macros() -> @str {
     macro_rules! warn ( ($($arg:tt)*) => (log!(2u32, $($arg)*)) )
     macro_rules! info ( ($($arg:tt)*) => (log!(3u32, $($arg)*)) )
     macro_rules! debug( ($($arg:tt)*) => (
-        if cfg!(debug) { log!(4u32, $($arg)*) }
+        if cfg!(not(ndebug)) { log!(4u32, $($arg)*) }
     ))
 
     macro_rules! log2(
@@ -730,7 +730,7 @@ pub fn std_macros() -> @str {
     macro_rules! warn2 ( ($($arg:tt)*) => (log2!(2u32, $($arg)*)) )
     macro_rules! info2 ( ($($arg:tt)*) => (log2!(3u32, $($arg)*)) )
     macro_rules! debug2( ($($arg:tt)*) => (
-        if cfg!(debug) { log2!(4u32, $($arg)*) }
+        if cfg!(not(ndebug)) { log2!(4u32, $($arg)*) }
     ))
 
     macro_rules! fail(
diff --git a/src/test/run-pass/conditional-debug-macro-off.rs b/src/test/run-pass/conditional-debug-macro-off.rs
index f40c8112e0b..1aae5ce29c0 100644
--- a/src/test/run-pass/conditional-debug-macro-off.rs
+++ b/src/test/run-pass/conditional-debug-macro-off.rs
@@ -9,9 +9,10 @@
 // except according to those terms.
 
 // xfail-fast exec-env directive doesn't work for check-fast
+// compile-flags: --cfg ndebug
 // exec-env:RUST_LOG=conditional-debug-macro-off=4
 
 fn main() {
     // only fails if debug! evaluates its argument.
     debug!({ if true { fail!() } });
-}
\ No newline at end of file
+}
diff --git a/src/test/run-pass/conditional-debug-macro-on.rs b/src/test/run-pass/conditional-debug-macro-on.rs
index 65b751a5826..2fe6d179348 100644
--- a/src/test/run-pass/conditional-debug-macro-on.rs
+++ b/src/test/run-pass/conditional-debug-macro-on.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // xfail-fast compile-flags directive doesn't work for check-fast
-// compile-flags: --cfg debug
 // exec-env:RUST_LOG=conditional-debug-macro-on=4
 
 fn main() {
@@ -18,4 +17,4 @@ fn main() {
     debug!({ if true { return; } });
 
     fail!();
-}
\ No newline at end of file
+}