fix: Improve terinal auto-detection

Author: epage

Cargo.lock

@@ -40,11 +40,11 @@ pre-release-replacements = [
 [features]
 default = ["color"]
 nightly = []
-color = ["dep:termcolor", "dep:concolor"]
+color = ["dep:anstyle", "dep:anstyle-stream"]
 
 [dependencies]
-termcolor = { version = "1.2.0", optional = true }
-concolor = { version = "0.0.12", features = ["auto"], optional = true }
+anstyle = { version = "0.3.1", optional = true }
+anstyle-stream = { version = "0.2.1", optional = true }
 uuid = { version = "1.3.0", features = ["v4"], default-features = false }
 serde_derive = "1.0.152"
 toml = "0.7.2"

Cargo.toml

@@ -149,32 +149,24 @@ impl Default for PanicStyle {
 /// Utility function that prints a message to our human users
 #[cfg(feature = "color")]
 pub fn print_msg<P: AsRef<Path>>(file_path: Option<P>, meta: &Metadata) -> IoResult<()> {
-    use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
+    use std::io::Write as _;
 
-    let stderr_support = concolor::get(concolor::Stream::Stdout);
-    let choice = if stderr_support.color() {
-        ColorChoice::Always
-    } else {
-        ColorChoice::Never
-    };
-
-    let stderr = BufferWriter::stderr(choice);
-    let mut buffer = stderr.buffer();
-    buffer.set_color(ColorSpec::new().set_fg(Some(Color::Red)))?;
-
-    write_msg(&mut buffer, file_path, meta)?;
+    let stderr = anstyle_stream::stderr();
+    let mut stderr = stderr.lock();
 
-    buffer.reset()?;
+    write!(stderr, "{}", anstyle::AnsiColor::Red.render_fg())?;
+    write_msg(&mut stderr, file_path, meta)?;
+    write!(stderr, "{}", anstyle::Reset.render())?;
 
-    stderr.print(&buffer).unwrap();
     Ok(())
 }
 
 #[cfg(not(feature = "color"))]
 pub fn print_msg<P: AsRef<Path>>(file_path: Option<P>, meta: &Metadata) -> IoResult<()> {
-    let mut buffer = std::io::stderr();
+    let stderr = std::io::stderr();
+    let mut stderr = stderr.lock();
 
-    write_msg(&mut buffer, file_path, meta)?;
+    write_msg(&mut stderr, file_path, meta)?;
 
     Ok(())
 }