Auto merge of #30012 - jonas-schievink:log-level-trace, r=alexcrichton

bors · bors · commit 9cf0e3c752e0 · 2015-11-24T11:10:22.000Z
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`.
diff --git a/src/liblog/directive.rs b/src/liblog/directive.rs
@@ -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> {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ pub struct LogDirective {`
`17`	`17`	`pub level: u32,`
`18`	`18`	`}`
`19`	`19`
`20`		`-pub const LOG_LEVEL_NAMES: [&'static str; 4] = ["ERROR", "WARN", "INFO", "DEBUG"];`
	`20`	`+pub const LOG_LEVEL_NAMES: [&'static str; 5] = ["ERROR", "WARN", "INFO", "DEBUG", "TRACE"];`
`21`	`21`
`22`	`22`	`/// Parse an individual log level that is either a number or a symbolic log level`
`23`	`23`	`fn parse_log_level(level: &str) -> Option<u32> {`