Skip to content

Commit

Permalink
Auto merge of rust-lang#30012 - jonas-schievink:log-level-trace, r=al…
Browse files Browse the repository at this point in the history
…excrichton

The `log` crate on crates.io already knows `TRACE`, but the internal liblog doesn't, which causes it to spew errors when a `TRACE` level is defined. I made `TRACE` behave like `DEBUG`.
  • Loading branch information
bors committed Nov 24, 2015
2 parents 561d088 + 3f36ce8 commit 9cf0e3c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/liblog/directive.rs
Expand Up @@ -17,7 +17,7 @@ pub struct LogDirective {
pub level: u32,
}

pub const LOG_LEVEL_NAMES: [&'static str; 4] = ["ERROR", "WARN", "INFO", "DEBUG"];
pub const LOG_LEVEL_NAMES: [&'static str; 5] = ["ERROR", "WARN", "INFO", "DEBUG", "TRACE"];

/// Parse an individual log level that is either a number or a symbolic log level
fn parse_log_level(level: &str) -> Option<u32> {
Expand Down

0 comments on commit 9cf0e3c

Please sign in to comment.