Replace anstyle with owo-colors

Cargo.lock

@@ -11,12 +11,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "anstyle"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bb0ec944fe041c41e32dcd60b49327fcb7ff761433838878cc97ddecf16db7"
-
 [[package]]
 name = "anyhow"
 version = "1.0.66"
@@ -37,6 +31,17 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -175,6 +180,15 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@@ -188,15 +202,15 @@ dependencies = [
 name = "hexyl"
 version = "0.11.0"
 dependencies = [
- "anstyle",
  "anyhow",
  "assert_cmd",
  "clap",
  "const_format",
- "is-terminal",
  "libc",
+ "owo-colors",
  "predicates",
  "pretty_assertions",
+ "supports-color",
  "terminal_size",
  "thiserror",
 ]
@@ -217,12 +231,18 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
  "io-lifetimes",
  "rustix",
  "windows-sys",
 ]
 
+[[package]]
+name = "is_ci"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -286,6 +306,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
 [[package]]
 name = "predicates"
 version = "2.1.4"
@@ -371,9 +397,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rustix"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
  "bitflags",
  "errno",
@@ -395,6 +421,16 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "supports-color"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f"
+dependencies = [
+ "atty",
+ "is_ci",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.105"

Cargo.toml

@@ -11,10 +11,10 @@ version = "0.11.0"
 edition = "2021"
 
 [dependencies]
-anstyle = "0.2"
 anyhow = "1.0"
 const_format = "0.2"
 libc = "0.2"
+owo-colors = "3"
 supports-color = "1"
 thiserror = "1.0"
 terminal_size = "0.2"

src/lib.rs

@@ -4,7 +4,7 @@ pub use input::*;
 
 use std::io::{self, BufReader, Read, Write};
 
-use anstyle::{AnsiColor, Reset};
+use owo_colors::{colors, Color};
 
 pub enum Base {
     Binary,
@@ -13,24 +13,13 @@ pub enum Base {
     Hexadecimal,
 }
 
-#[derive(PartialEq, Eq)]
+const COLOR_NULL: &'static [u8] = colors::BrightBlack::ANSI_FG.as_bytes();
-#[repr(usize)]
+const COLOR_OFFSET: &'static [u8] = colors::BrightBlack::ANSI_FG.as_bytes();
-enum ByteColor {
+const COLOR_ASCII_PRINTABLE: &'static [u8] = colors::Cyan::ANSI_FG.as_bytes();
-    Null = 0,
+const COLOR_ASCII_WHITESPACE: &'static [u8] = colors::Green::ANSI_FG.as_bytes();
-    Offset = 1,
+const COLOR_ASCII_OTHER: &'static [u8] = colors::Green::ANSI_FG.as_bytes();
-    AsciiPrintable = 2,
+const COLOR_NONASCII: &'static [u8] = colors::Yellow::ANSI_FG.as_bytes();
-    AsciiWhitespace = 3,
+const COLOR_RESET: &'static [u8] = colors::Default::ANSI_FG.as_bytes();
-    AsciiOther = 4,
-    NonAscii = 5,
-    Reset = 6,
-}
-
-const COLOR_NULL: AnsiColor = AnsiColor::BrightBlack;
-const COLOR_OFFSET: AnsiColor = AnsiColor::BrightBlack;
-const COLOR_ASCII_PRINTABLE: AnsiColor = AnsiColor::Cyan;
-const COLOR_ASCII_WHITESPACE: AnsiColor = AnsiColor::Green;
-const COLOR_ASCII_OTHER: AnsiColor = AnsiColor::Magenta;
-const COLOR_NONASCII: AnsiColor = AnsiColor::Yellow;
 
 pub enum ByteCategory {
     Null,
@@ -66,15 +55,15 @@ impl Byte {
         }
     }
 
-    fn color(self) -> ByteColor {
+    fn color(self) -> &'static [u8] {
         use crate::ByteCategory::*;
 
         match self.category() {
-            Null => ByteColor::Null,
+            Null => COLOR_NULL,
-            AsciiPrintable => ByteColor::AsciiPrintable,
+            AsciiPrintable => COLOR_ASCII_PRINTABLE,
-            AsciiWhitespace => ByteColor::AsciiWhitespace,
+            AsciiWhitespace => COLOR_ASCII_WHITESPACE,
-            AsciiOther => ByteColor::AsciiOther,
+            AsciiOther => COLOR_ASCII_OTHER,
-            NonAscii => ByteColor::NonAscii,
+            NonAscii => COLOR_NONASCII,
         }
     }
 
@@ -250,8 +239,7 @@ pub struct Printer<'a, Writer: Write> {
     show_char_panel: bool,
     show_position_panel: bool,
     show_color: bool,
-    colors: Vec<String>,
+    curr_color: Option<&'static [u8]>,
-    curr_color: Option<ByteColor>,
     border_style: BorderStyle,
     byte_hex_panel: Vec<String>,
     byte_char_panel: Vec<String>,
@@ -288,15 +276,6 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
             show_position_panel,
             show_color,
             curr_color: None,
-            colors: vec![
-                COLOR_NULL.render_fg().to_string(),
-                COLOR_OFFSET.render_fg().to_string(),
-                COLOR_ASCII_PRINTABLE.render_fg().to_string(),
-                COLOR_ASCII_WHITESPACE.render_fg().to_string(),
-                COLOR_ASCII_OTHER.render_fg().to_string(),
-                COLOR_NONASCII.render_fg().to_string(),
-                Reset.render().to_string(),
-            ],
             border_style,
             byte_hex_panel: (0u8..=u8::MAX)
                 .map(|i| match base {
@@ -398,8 +377,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                 .as_bytes(),
         )?;
         if self.show_color {
-            self.writer
+            self.writer.write_all(COLOR_OFFSET)?;
-                .write_all(self.colors[ByteColor::Offset as usize].as_bytes())?;
         }
         if self.show_position_panel {
             match self.squeezer {
@@ -407,8 +385,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                     self.writer
                         .write_all(self.byte_char_panel[b'*' as usize].as_bytes())?;
                     if self.show_color {
-                        self.writer
+                        self.writer.write_all(COLOR_RESET)?;
-                            .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
                     }
                     self.writer.write_all(b"       ")?;
                 }
@@ -423,8 +400,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                             .write_all(self.byte_hex_panel_g[byte as usize].as_bytes())?;
                     }
                     if self.show_color {
-                        self.writer
+                        self.writer.write_all(COLOR_RESET)?;
-                            .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
                     }
                 }
             }
@@ -444,8 +420,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
             Squeezer::Ignore | Squeezer::Disabled => {
                 if let Some(&b) = self.line_buf.get(i as usize) {
                     if self.show_color && self.curr_color != Some(Byte(b).color()) {
-                        self.writer
+                        self.writer.write_all(Byte(b).color())?;
-                            .write_all(self.colors[Byte(b).color() as usize].as_bytes())?;
                         self.curr_color = Some(Byte(b).color());
                     }
                     self.writer
@@ -457,8 +432,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
         }
         if i == 8 * self.panels - 1 {
             if self.show_color {
-                self.writer
+                self.writer.write_all(COLOR_RESET)?;
-                    .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
                 self.curr_color = None;
             }
             self.writer.write_all(
@@ -469,8 +443,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
             )?;
         } else if i % 8 == 7 {
             if self.show_color {
-                self.writer
+                self.writer.write_all(COLOR_RESET)?;
-                    .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
                 self.curr_color = None;
             }
             self.writer.write_all(
@@ -496,14 +469,12 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
             Squeezer::Print => {
                 if !self.show_position_panel && i == 0 {
                     if self.show_color {
-                        self.writer
+                        self.writer.write_all(COLOR_OFFSET)?;
-                            .write_all(self.colors[ByteColor::Offset as usize].as_bytes())?;
                     }
                     self.writer
                         .write_all(self.byte_char_panel[b'*' as usize].as_bytes())?;
                     if self.show_color {
-                        self.writer
+                        self.writer.write_all(COLOR_RESET)?;
-                            .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
                     }
                 } else {
                     if i % (self.group_bytes as usize) == 0 {
@@ -520,8 +491,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                     self.writer.write_all(b" ")?;
                 }
                 if self.show_color && self.curr_color != Some(Byte(b).color()) {
-                    self.writer
+                    self.writer.write_all(Byte(b).color())?;
-                        .write_all(self.colors[Byte(b).color() as usize].as_bytes())?;
                     self.curr_color = Some(Byte(b).color());
                 }
                 self.writer
@@ -532,8 +502,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
         if i % 8 == 7 {
             if self.show_color {
                 self.curr_color = None;
-                self.writer
+                self.writer.write_all(COLOR_RESET)?;
-                    .write_all(self.colors[ByteColor::Reset as usize].as_bytes())?;
             }
             self.writer.write_all(b" ")?;
             // byte is last in last panel