@@ -84,11 +84,11 @@ impl Byte {
8484 fn color ( self ) -> & ' static [ u8 ] {
8585 use crate :: ByteCategory :: * ;
8686 match self . category ( ) {
87- Null => COLOR_NULL ,
88- AsciiPrintable => COLOR_ASCII_PRINTABLE ,
89- AsciiWhitespace => COLOR_ASCII_WHITESPACE ,
90- AsciiOther => COLOR_ASCII_OTHER ,
91- NonAscii => COLOR_NONASCII ,
87+ Null => COLOR_NULL . as_bytes ( ) ,
88+ AsciiPrintable => COLOR_ASCII_PRINTABLE . as_bytes ( ) ,
89+ AsciiWhitespace => COLOR_ASCII_WHITESPACE . as_bytes ( ) ,
90+ AsciiOther => COLOR_ASCII_OTHER . as_bytes ( ) ,
91+ NonAscii => COLOR_NONASCII . as_bytes ( ) ,
9292 }
9393 }
9494
@@ -440,14 +440,14 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
440440 . as_bytes ( ) ,
441441 ) ?;
442442 if self . show_color {
443- self . writer . write_all ( COLOR_OFFSET ) ?;
443+ self . writer . write_all ( COLOR_OFFSET . as_bytes ( ) ) ?;
444444 }
445445 if self . show_position_panel {
446446 match self . squeezer {
447447 Squeezer :: Print => {
448448 self . writer . write_all ( b"*" ) ?;
449449 if self . show_color {
450- self . writer . write_all ( COLOR_RESET ) ?;
450+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
451451 }
452452 self . writer . write_all ( b" " ) ?;
453453 }
@@ -462,7 +462,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
462462 . write_all ( self . byte_hex_panel_g [ byte as usize ] . as_bytes ( ) ) ?;
463463 }
464464 if self . show_color {
465- self . writer . write_all ( COLOR_RESET ) ?;
465+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
466466 }
467467 }
468468 }
@@ -494,7 +494,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
494494 }
495495 if i == 8 * self . panels - 1 {
496496 if self . show_color {
497- self . writer . write_all ( COLOR_RESET ) ?;
497+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
498498 self . curr_color = None ;
499499 }
500500 self . writer . write_all (
@@ -505,7 +505,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
505505 ) ?;
506506 } else if i % 8 == 7 {
507507 if self . show_color {
508- self . writer . write_all ( COLOR_RESET ) ?;
508+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
509509 self . curr_color = None ;
510510 }
511511 self . writer . write_all (
@@ -531,12 +531,12 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
531531 Squeezer :: Print => {
532532 if !self . show_position_panel && i == 0 {
533533 if self . show_color {
534- self . writer . write_all ( COLOR_OFFSET ) ?;
534+ self . writer . write_all ( COLOR_OFFSET . as_bytes ( ) ) ?;
535535 }
536536 self . writer
537537 . write_all ( self . byte_char_panel [ b'*' as usize ] . as_bytes ( ) ) ?;
538538 if self . show_color {
539- self . writer . write_all ( COLOR_RESET ) ?;
539+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
540540 }
541541 } else if i % ( self . group_size as usize ) == 0 {
542542 self . writer . write_all ( b" " ) ?;
@@ -562,7 +562,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
562562 if i % 8 == 7 {
563563 if self . show_color {
564564 self . curr_color = None ;
565- self . writer . write_all ( COLOR_RESET ) ?;
565+ self . writer . write_all ( COLOR_RESET . as_bytes ( ) ) ?;
566566 }
567567 self . writer . write_all ( b" " ) ?;
568568 // byte is last in last panel
0 commit comments