From 3b0258916d28a1215acf9a0c78f6760cc67f935c Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Sat, 13 Jul 2013 14:08:05 -0700 Subject: [PATCH] Rename print!()/println!() to printf!()/printfln!() The new names make it obvious that these generate formatted output. Add a one-argument case that uses %? to format, just like the other format-using macros (e.g. info!()). --- src/libsyntax/ext/expand.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 73fa659a7aa..2c3f42cca9a 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -644,16 +644,22 @@ pub fn core_macros() -> @str { ); ) - macro_rules! print( - ($( $arg:expr),+) => ( { - print(fmt!($($arg),+)); - } ) + macro_rules! printf ( + ($arg:expr) => ( + print(fmt!(\"%?\", $arg)) + ); + ($( $arg:expr ),+) => ( + print(fmt!($($arg),+)) + ) ) - macro_rules! println( - ($( $arg:expr),+) => ( { - println(fmt!($($arg),+)); - } ) + macro_rules! printfln ( + ($arg:expr) => ( + println(fmt!(\"%?\", $arg)) + ); + ($( $arg:expr ),+) => ( + println(fmt!($($arg),+)) + ) ) }"; }