@@ -46,18 +46,11 @@ fn console_logger<S>(process: &Process) -> (impl Layer<S> + use<S>, reload::Hand
4646where
4747 S : Subscriber + for < ' span > LookupSpan < ' span > ,
4848{
49- let has_ansi = match process. var ( "RUSTUP_TERM_COLOR" ) {
50- Ok ( s) if s. eq_ignore_ascii_case ( "always" ) => true ,
51- Ok ( s) if s. eq_ignore_ascii_case ( "never" ) => false ,
52- // `RUSTUP_TERM_COLOR` is prioritized over `NO_COLOR`.
53- _ if process. var ( "NO_COLOR" ) . is_ok ( ) => false ,
54- _ => process. stderr ( ) . is_a_tty ( ) ,
55- } ;
5649 let maybe_rustup_log_directives = process. var ( "RUSTUP_LOG" ) ;
5750 let process = process. clone ( ) ;
5851 let logger = tracing_subscriber:: fmt:: layer ( )
5952 . with_writer ( process. stderr ( ) )
60- . with_ansi ( has_ansi ) ;
53+ . with_ansi ( true ) ; // `process.stderr()` will translate ANSI escape codes
6154 if let Ok ( directives) = maybe_rustup_log_directives {
6255 let ( env_filter, handle) = reload:: Layer :: new (
6356 EnvFilter :: builder ( )
9386 mut writer : format:: Writer < ' _ > ,
9487 event : & Event < ' _ > ,
9588 ) -> fmt:: Result {
96- let has_ansi = writer. has_ansi_escapes ( ) ;
9789 let level = NotificationLevel :: from ( * event. metadata ( ) . level ( ) ) ;
9890 {
99- let level_style = if has_ansi {
100- Style :: new ( ) . bold ( ) . fg_color ( level. fg_color ( ) )
101- } else {
102- Style :: new ( )
103- } ;
91+ let level_style = Style :: new ( ) . bold ( ) . fg_color ( level. fg_color ( ) ) ;
10492 write ! ( & mut writer, "{level_style}{level}:{level_style:#} " ) ?;
10593 }
10694 ctx. field_format ( ) . format_fields ( writer. by_ref ( ) , event) ?;
0 commit comments