@@ -411,22 +411,16 @@ impl ShellOut {
411
411
412
412
/// Write a styled fragment
413
413
fn write_stdout ( & mut self , fragment : impl fmt:: Display , style : & Style ) -> Result < ( ) > {
414
- let style = style. render ( ) ;
415
- let reset = anstyle:: Reset . render ( ) ;
416
-
417
414
let mut buffer = Vec :: new ( ) ;
418
- write ! ( buffer, "{style}{fragment}{reset }" ) ?;
415
+ write ! ( buffer, "{style}{fragment}{style:# }" ) ?;
419
416
self . stdout ( ) . write_all ( & buffer) ?;
420
417
Ok ( ( ) )
421
418
}
422
419
423
420
/// Write a styled fragment
424
421
fn write_stderr ( & mut self , fragment : impl fmt:: Display , style : & Style ) -> Result < ( ) > {
425
- let style = style. render ( ) ;
426
- let reset = anstyle:: Reset . render ( ) ;
427
-
428
422
let mut buffer = Vec :: new ( ) ;
429
- write ! ( buffer, "{style}{fragment}{reset }" ) ?;
423
+ write ! ( buffer, "{style}{fragment}{style:# }" ) ?;
430
424
self . stderr ( ) . write_all ( & buffer) ?;
431
425
Ok ( ( ) )
432
426
}
@@ -456,19 +450,17 @@ impl ShellOut {
456
450
style : & Style ,
457
451
justified : bool ,
458
452
) -> Result < Vec < u8 > > {
459
- let style = style. render ( ) ;
460
- let bold = ( anstyle:: Style :: new ( ) | anstyle:: Effects :: BOLD ) . render ( ) ;
461
- let reset = anstyle:: Reset . render ( ) ;
453
+ let bold = anstyle:: Style :: new ( ) . bold ( ) ;
462
454
463
455
let mut buffer = Vec :: new ( ) ;
464
456
if justified {
465
- write ! ( & mut buffer, "{style}{status:>12}{reset }" ) ?;
457
+ write ! ( buffer, "{style}{status:>12}{style:# }" ) ?;
466
458
} else {
467
- write ! ( & mut buffer, "{style}{status}{reset }{bold}:{reset }" ) ?;
459
+ write ! ( buffer, "{style}{status}{style:# }{bold}:{bold:# }" ) ?;
468
460
}
469
461
match message {
470
462
Some ( message) => {
471
- writeln ! ( & mut buffer, " {message}" ) ?;
463
+ writeln ! ( buffer, " {message}" ) ?;
472
464
}
473
465
None => write ! ( buffer, " " ) ?,
474
466
}
0 commit comments