Skip to content

Commit 9c7e16e

Browse files
committed
Remove the log keyword (by renaming it to __log)
We can't quite remove logging from the language, but this hides the keyword.
1 parent cb37d09 commit 9c7e16e

File tree

4 files changed

+10
-24
lines changed

4 files changed

+10
-24
lines changed

src/libsyntax/ext/expand.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -411,34 +411,34 @@ pub fn core_macros() -> ~str {
411411

412412
macro_rules! error (
413413
($arg:expr) => (
414-
log(1u32, fmt!( \"%?\", $arg ))
414+
__log(1u32, fmt!( \"%?\", $arg ))
415415
);
416416
($( $arg:expr ),+) => (
417-
log(1u32, fmt!( $($arg),+ ))
417+
__log(1u32, fmt!( $($arg),+ ))
418418
)
419419
)
420420
macro_rules! warn (
421421
($arg:expr) => (
422-
log(2u32, fmt!( \"%?\", $arg ))
422+
__log(2u32, fmt!( \"%?\", $arg ))
423423
);
424424
($( $arg:expr ),+) => (
425-
log(2u32, fmt!( $($arg),+ ))
425+
__log(2u32, fmt!( $($arg),+ ))
426426
)
427427
)
428428
macro_rules! info (
429429
($arg:expr) => (
430-
log(3u32, fmt!( \"%?\", $arg ))
430+
__log(3u32, fmt!( \"%?\", $arg ))
431431
);
432432
($( $arg:expr ),+) => (
433-
log(3u32, fmt!( $($arg),+ ))
433+
__log(3u32, fmt!( $($arg),+ ))
434434
)
435435
)
436436
macro_rules! debug (
437437
($arg:expr) => (
438-
log(4u32, fmt!( \"%?\", $arg ))
438+
__log(4u32, fmt!( \"%?\", $arg ))
439439
);
440440
($( $arg:expr ),+) => (
441-
log(4u32, fmt!( $($arg),+ ))
441+
__log(4u32, fmt!( $($arg),+ ))
442442
)
443443
)
444444

src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ pub impl Parser {
11841184
}
11851185
}
11861186
hi = self.span.hi;
1187-
} else if self.eat_keyword(&~"log") {
1187+
} else if self.eat_keyword(&~"__log") {
11881188
self.expect(&token::LPAREN);
11891189
let lvl = self.parse_expr();
11901190
self.expect(&token::COMMA);

src/libsyntax/parse/token.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ pub fn strict_keyword_table() -> HashMap<~str, ()> {
495495
~"else", ~"enum", ~"extern",
496496
~"false", ~"fn", ~"for",
497497
~"if", ~"impl",
498-
~"let", ~"log", ~"loop",
498+
~"let", ~"__log", ~"loop",
499499
~"match", ~"mod", ~"mut",
500500
~"once",
501501
~"priv", ~"pub", ~"pure",

src/test/run-fail/issue-1459.rs

-14
This file was deleted.

0 commit comments

Comments
 (0)