Skip to content

Commit c6a42a4

Browse files
committed
---
yaml --- r: 50536 b: refs/heads/try c: 8453f31 h: refs/heads/master v: v3
1 parent 6f3cbdb commit c6a42a4

File tree

4 files changed

+10
-43
lines changed

4 files changed

+10
-43
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: eaed16cea6c83c49bfb3d4a663f9b715f86d1f37
5+
refs/heads/try: 8453f3110c7b84fe4a29c743b57f846fb5f654d3
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/emacs/rust-mode.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
(require 'cm-mode)
99
(require 'cc-mode)
10+
(eval-when-compile (require 'cl))
1011

1112
(defun rust-electric-brace (arg)
1213
(interactive "*P")

branches/try/src/libsyntax/ext/expand.rs

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

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-
)
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),+ )) ))
444420

445421
macro_rules! fail(
446422
($msg: expr) => (

branches/try/src/test/run-pass/log-poly.rs

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)