---

yaml
---
r: 49145
b: refs/heads/master
c: 8453f31
h: refs/heads/master
i:
  49143: 1bacaaa
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: eaed16cea6c83c49bfb3d4a663f9b715f86d1f37
+refs/heads/master: 8453f3110c7b84fe4a29c743b57f846fb5f654d3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/etc/emacs/rust-mode.el

@@ -7,6 +7,7 @@
 
 (require 'cm-mode)
 (require 'cc-mode)
+(eval-when-compile (require 'cl))
 
 (defun rust-electric-brace (arg)
   (interactive "*P")

trunk/src/libsyntax/ext/expand.rs

@@ -409,38 +409,14 @@ pub fn core_macros() -> ~str {
 ~"pub mod macros {
     macro_rules! ignore (($($x:tt)*) => (()))
 
-    macro_rules! error (
-        ($arg:expr) => (
-            log(::core::error, fmt!( \"%?\", $arg ))
-        );
-        ($( $arg:expr ),+) => (
-            log(::core::error, fmt!( $($arg),+ ))
-        )
-    )
-    macro_rules! warn (
-        ($arg:expr) => (
-            log(::core::warn, fmt!( \"%?\", $arg ))
-        );
-        ($( $arg:expr ),+) => (
-            log(::core::warn, fmt!( $($arg),+ ))
-        )
-    )
-    macro_rules! info (
-        ($arg:expr) => (
-            log(::core::info, fmt!( \"%?\", $arg ))
-        );
-        ($( $arg:expr ),+) => (
-            log(::core::info, fmt!( $($arg),+ ))
-        )
-    )
-    macro_rules! debug (
-        ($arg:expr) => (
-            log(::core::debug, fmt!( \"%?\", $arg ))
-        );
-        ($( $arg:expr ),+) => (
-            log(::core::debug, fmt!( $($arg),+ ))
-        )
-    )
+    macro_rules! error ( ($( $arg:expr ),+) => (
+        log(::core::error, fmt!( $($arg),+ )) ))
+    macro_rules! warn ( ($( $arg:expr ),+) => (
+        log(::core::warn, fmt!( $($arg),+ )) ))
+    macro_rules! info ( ($( $arg:expr ),+) => (
+        log(::core::info, fmt!( $($arg),+ )) ))
+    macro_rules! debug ( ($( $arg:expr ),+) => (
+        log(::core::debug, fmt!( $($arg),+ )) ))
 
     macro_rules! fail(
         ($msg: expr) => (