Skip to content

Commit 5e704f1

Browse files
committed
---
yaml --- r: 46867 b: refs/heads/auto c: 8453f31 h: refs/heads/master i: 46865: b4519c9 46863: bbe6da3 v: v3
1 parent 7380305 commit 5e704f1

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
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: eaed16cea6c83c49bfb3d4a663f9b715f86d1f37
17+
refs/heads/auto: 8453f3110c7b84fe4a29c743b57f846fb5f654d3

branches/auto/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/auto/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/auto/src/test/run-pass/log-poly.rs

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

0 commit comments

Comments
 (0)