diff --git a/src/comp/syntax/ext/expand.rs b/src/comp/syntax/ext/expand.rs index 150f9ad97bb4..8a28f7dc84cf 100644 --- a/src/comp/syntax/ext/expand.rs +++ b/src/comp/syntax/ext/expand.rs @@ -55,10 +55,10 @@ fn expand_expr(exts: hashmap, cx: ext_ctxt, e: expr_, fn core_macros() -> str { ret "{ - #macro[[#error[f, ...], log_err #fmt[f, ...]]]; - #macro[[#warn[f, ...], log_err #fmt[f, ...]]]; - #macro[[#info[f, ...], log_err #fmt[f, ...]]]; - #macro[[#debug[f, ...], log_err #fmt[f, ...]]]; + #macro[[#error[f, ...], log_full(core::error, #fmt[f, ...])]]; + #macro[[#warn[f, ...], log_full(core::warn, #fmt[f, ...])]]; + #macro[[#info[f, ...], log_full(core::info, #fmt[f, ...])]]; + #macro[[#debug[f, ...], log_full(core::debug, #fmt[f, ...])]]; }"; } diff --git a/src/libcore/core.rs b/src/libcore/core.rs index 48e7a5f64cab..6e3120df17ac 100644 --- a/src/libcore/core.rs +++ b/src/libcore/core.rs @@ -11,7 +11,8 @@ export option, some, none; // more-verbosity. Error is the bottom level, default logging level is // warn-and-below. -const error : int = 0; -const warn : int = 1; -const info : int = 2; -const debug : int = 3; +export error, warn, info, debug; +const error : u32 = 0_u32; +const warn : u32 = 1_u32; +const info : u32 = 2_u32; +const debug : u32 = 3_u32; diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp index 226ff2ff1590..645bffb1c0af 100644 --- a/src/rt/rust_log.cpp +++ b/src/rt/rust_log.cpp @@ -129,12 +129,12 @@ struct log_directive { }; const size_t max_log_directives = 255; -const size_t max_log_level = 1; +const size_t max_log_level = 255; const size_t default_log_level = 0; // This is a rather ugly parser for strings in the form -// "crate1,crate2.mod3,crate3.x=1". Log levels are 0-1 for now, -// eventually we'll have 0-3. +// "crate1,crate2.mod3,crate3.x=1". Log levels are 0-255, +// with the most likely ones being 0-3 (defined in core::). size_t parse_logging_spec(char* spec, log_directive* dirs) { size_t dir = 0; while (dir < max_log_directives && *spec) { diff --git a/src/snapshots.txt b/src/snapshots.txt index 4cefb1f24992..986bf8c11f54 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,10 +1,3 @@ -S 2011-12-21 047b02d - winnt-i386 cf6ed4fed5b07357cea5865ff91a9c4a0377a2f0 - linux-i386 6f6e329199d4e3e3ce2e9dc595fe6f4334e00684 - macos-i386 d125f065125bf0f3186d88afd58a1e471fe830a3 - linux-x86_64 c3315c5c679648bcfdf65910f427a37982918b09 - macos-x86_64 bab127bc6c383889d482c99e771be5e80405d7c9 - S 2011-12-19 edf6e1e winnt-i386 7a358117e123ad3d16fa66106819ec0daf5a6aba linux-i386 87b9a54e2e165b5c800236f49ee58522c8664226