Skip to content

Commit 42bacbb

Browse files
committed
---
yaml --- r: 49144 b: refs/heads/master c: eaed16c h: refs/heads/master v: v3
1 parent 1bacaaa commit 42bacbb

File tree

3 files changed

+43
-9
lines changed

3 files changed

+43
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: ac3dc66ec14100c04de232b2aba366301a05a837
2+
refs/heads/master: eaed16cea6c83c49bfb3d4a663f9b715f86d1f37
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libsyntax/ext/expand.rs

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,38 @@ pub fn core_macros() -> ~str {
409409
~"pub mod macros {
410410
macro_rules! ignore (($($x:tt)*) => (()))
411411

412-
macro_rules! error ( ($( $arg:expr ),+) => (
413-
log(::core::error, fmt!( $($arg),+ )) ))
414-
macro_rules! warn ( ($( $arg:expr ),+) => (
415-
log(::core::warn, fmt!( $($arg),+ )) ))
416-
macro_rules! info ( ($( $arg:expr ),+) => (
417-
log(::core::info, fmt!( $($arg),+ )) ))
418-
macro_rules! debug ( ($( $arg:expr ),+) => (
419-
log(::core::debug, fmt!( $($arg),+ )) ))
412+
macro_rules! error (
413+
($arg:expr) => (
414+
log(::core::error, fmt!( \"%?\", $arg ))
415+
);
416+
($( $arg:expr ),+) => (
417+
log(::core::error, fmt!( $($arg),+ ))
418+
)
419+
)
420+
macro_rules! warn (
421+
($arg:expr) => (
422+
log(::core::warn, fmt!( \"%?\", $arg ))
423+
);
424+
($( $arg:expr ),+) => (
425+
log(::core::warn, fmt!( $($arg),+ ))
426+
)
427+
)
428+
macro_rules! info (
429+
($arg:expr) => (
430+
log(::core::info, fmt!( \"%?\", $arg ))
431+
);
432+
($( $arg:expr ),+) => (
433+
log(::core::info, fmt!( $($arg),+ ))
434+
)
435+
)
436+
macro_rules! debug (
437+
($arg:expr) => (
438+
log(::core::debug, fmt!( \"%?\", $arg ))
439+
);
440+
($( $arg:expr ),+) => (
441+
log(::core::debug, fmt!( $($arg),+ ))
442+
)
443+
)
420444

421445
macro_rules! fail(
422446
($msg: expr) => (

trunk/src/test/run-pass/log-poly.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
enum Numbers {
2+
Three
3+
}
4+
5+
fn main() {
6+
debug!(1);
7+
info!(2.0);
8+
warn!(Three);
9+
error!(~[4]);
10+
}

0 commit comments

Comments
 (0)