diff options
| author | bors <bors@rust-lang.org> | 2013-09-09 10:41:05 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-09 10:41:05 -0700 |
| commit | 059cbaadfaea9a397c144a0a7beff0fc5e9e2664 (patch) | |
| tree | aa520ddc411d71091bd8c1089bda4f69092fed26 /src/libsyntax/parse/token.rs | |
| parent | fd2488bf5aeb1c4959bc91f3a17a0bde848d2eeb (diff) | |
| parent | 8a966183fe5129ea2a55a9898ac1bd0f16f3573d (diff) | |
| download | rust-059cbaadfaea9a397c144a0a7beff0fc5e9e2664.tar.gz rust-059cbaadfaea9a397c144a0a7beff0fc5e9e2664.zip | |
auto merge of #9005 : alexcrichton/rust/rusty-log, r=brson
Also redefine all of the standard logging macros to use more rust code instead of custom LLVM translation code. This makes them a bit easier to understand, but also more flexibile for future types of logging. Additionally, this commit removes the LogType language item in preparation for changing how logging is performed.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 6b3a95a14f8..fa00b536837 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -456,7 +456,7 @@ fn mk_fresh_ident_interner() -> @ident_interner { "if", // 42 "impl", // 43 "let", // 44 - "__log", // 45 + "__log_level", // 45 "loop", // 46 "match", // 47 "mod", // 48 @@ -606,7 +606,7 @@ pub mod keywords { Impl, In, Let, - __Log, + __LogLevel, Loop, Match, Mod, @@ -651,7 +651,7 @@ pub mod keywords { Impl => Ident { name: 43, ctxt: 0 }, In => Ident { name: 63, ctxt: 0 }, Let => Ident { name: 44, ctxt: 0 }, - __Log => Ident { name: 45, ctxt: 0 }, + __LogLevel => Ident { name: 45, ctxt: 0 }, Loop => Ident { name: 46, ctxt: 0 }, Match => Ident { name: 47, ctxt: 0 }, Mod => Ident { name: 48, ctxt: 0 }, |