@@ -22,12 +22,12 @@ pub const LOG_LEVEL_NAMES: [&'static str; 5] = ["ERROR", "WARN", "INFO", "DEBUG"
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 > {
24
24
level. parse :: < u32 > ( )
25
- . ok ( )
26
- . or_else ( || {
27
- let pos = LOG_LEVEL_NAMES . iter ( ) . position ( |& name| name. eq_ignore_ascii_case ( level) ) ;
28
- pos. map ( |p| p as u32 + 1 )
29
- } )
30
- . map ( |p| cmp:: min ( p, :: MAX_LOG_LEVEL ) )
25
+ . ok ( )
26
+ . or_else ( || {
27
+ let pos = LOG_LEVEL_NAMES . iter ( ) . position ( |& name| name. eq_ignore_ascii_case ( level) ) ;
28
+ pos. map ( |p| p as u32 + 1 )
29
+ } )
30
+ . map ( |p| cmp:: min ( p, :: MAX_LOG_LEVEL ) )
31
31
}
32
32
33
33
/// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=1/foo")
@@ -52,32 +52,31 @@ pub fn parse_logging_spec(spec: &str) -> (Vec<LogDirective>, Option<String>) {
52
52
continue ;
53
53
}
54
54
let mut parts = s. split ( '=' ) ;
55
- let ( log_level, name) = match ( parts . next ( ) ,
56
- parts. next ( ) . map ( |s| s. trim ( ) ) ,
57
- parts . next ( ) ) {
58
- ( Some ( part0 ) , None , None ) => {
59
- // if the single argument is a log-level string or number,
60
- // treat that as a global fallback
61
- match parse_log_level ( part0 ) {
62
- Some ( num ) => ( num , None ) ,
63
- None => ( :: MAX_LOG_LEVEL , Some ( part0 ) ) ,
55
+ let ( log_level, name) =
56
+ match ( parts . next ( ) , parts. next ( ) . map ( |s| s. trim ( ) ) , parts . next ( ) ) {
57
+ ( Some ( part0 ) , None , None ) => {
58
+ // if the single argument is a log-level string or number,
59
+ // treat that as a global fallback
60
+ match parse_log_level ( part0 ) {
61
+ Some ( num ) => ( num , None ) ,
62
+ None => ( :: MAX_LOG_LEVEL , Some ( part0 ) ) ,
63
+ }
64
64
}
65
- }
66
- ( Some ( part0) , Some ( "" ) , None ) => ( :: MAX_LOG_LEVEL , Some ( part0 ) ) ,
67
- ( Some ( part0 ) , Some ( part1) , None ) => {
68
- match parse_log_level ( part1 ) {
69
- Some ( num ) => ( num , Some ( part0 ) ) ,
70
- _ => {
71
- println ! ( "warning: invalid logging spec '{}', ignoring it" , part1 ) ;
72
- continue ;
65
+ ( Some ( part0 ) , Some ( "" ) , None ) => ( :: MAX_LOG_LEVEL , Some ( part0 ) ) ,
66
+ ( Some ( part0) , Some ( part1 ) , None ) => {
67
+ match parse_log_level ( part1) {
68
+ Some ( num ) => ( num , Some ( part0 ) ) ,
69
+ _ => {
70
+ println ! ( "warning: invalid logging spec '{}', ignoring it" , part1 ) ;
71
+ continue ;
72
+ }
73
73
}
74
74
}
75
- }
76
- _ => {
77
- println ! ( "warning: invalid logging spec '{}', ignoring it" , s) ;
78
- continue ;
79
- }
80
- } ;
75
+ _ => {
76
+ println ! ( "warning: invalid logging spec '{}', ignoring it" , s) ;
77
+ continue ;
78
+ }
79
+ } ;
81
80
dirs. push ( LogDirective {
82
81
name : name. map ( str:: to_owned) ,
83
82
level : log_level,
0 commit comments