diff options
| author | bors <bors@rust-lang.org> | 2015-11-24 11:10:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-24 11:10:22 +0000 |
| commit | 9cf0e3c752e05d49019f9bc5f12d290545ba58a4 (patch) | |
| tree | 3bbc95880f09540f9220cff4dec391fcc9013350 | |
| parent | 561d0884e5563569e6e5c6b9a72b7b7d0bd44302 (diff) | |
| parent | 3f36ce82389952b1c4d760c008881a720278535d (diff) | |
| download | rust-9cf0e3c752e05d49019f9bc5f12d290545ba58a4.tar.gz rust-9cf0e3c752e05d49019f9bc5f12d290545ba58a4.zip | |
Auto merge of #30012 - jonas-schievink:log-level-trace, r=alexcrichton
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`.
| -rw-r--r-- | src/liblog/directive.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liblog/directive.rs b/src/liblog/directive.rs index 3958969cfca..59e5b72d961 100644 --- 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> { |