Switch from colored to owo_colors/anstream

Cargo.toml

@@ -14,6 +14,7 @@ license = "MIT"
 [workspace.dependencies]
 aho-corasick = { version = "1.1.3" }
 annotate-snippets = { version = "0.9.2", features = ["color"] }
+anstream = { version = "0.6.13" }
 anyhow = { version = "1.0.80" }
 argfile = { version = "0.1.6" }
 bincode = { version = "1.3.3" }
@@ -25,7 +26,6 @@ clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.5.1" }
 clearscreen = { version = "2.0.0" }
 codspeed-criterion-compat = { version = "2.4.0", default-features = false }
-colored = { version = "2.1.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
@@ -65,6 +65,7 @@ natord = { version = "1.0.9" }
 notify = { version = "6.1.1" }
 num_cpus = { version = "1.16.0" }
 once_cell = { version = "1.19.0" }
+owo-colors = { version = "4.0.0" }
 path-absolutize = { version = "3.1.1" }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.5.0", features = ["serde"] }

crates/ruff/Cargo.toml

@@ -25,6 +25,7 @@ ruff_source_file = { path = "../ruff_source_file" }
 ruff_text_size = { path = "../ruff_text_size" }
 ruff_workspace = { path = "../ruff_workspace" }
 
+anstream = { workspace = true }
 anyhow = { workspace = true }
 argfile = { workspace = true }
 bincode = { workspace = true }
@@ -34,14 +35,14 @@ chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "env", "wrap_help"] }
 clap_complete_command = { workspace = true }
 clearscreen = { workspace = true }
-colored = { workspace = true }
 filetime = { workspace = true }
 ignore = { workspace = true }
 is-macro = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
 notify = { workspace = true }
 num_cpus = { workspace = true }
+owo-colors = { workspace = true }
 path-absolutize = { workspace = true, features = ["once_cell_cache"] }
 rayon = { workspace = true }
 regex = { workspace = true }
@@ -62,8 +63,6 @@ wild = { workspace = true }
 [dev-dependencies]
 # Enable test rules during development
 ruff_linter = { path = "../ruff_linter", features = ["clap", "test-rules"] }
-# Avoid writing colored snapshots when running tests from the terminal
-colored = { workspace = true, features = ["no-color"] }
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
 tempfile = { workspace = true }

crates/ruff/src/args.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use anyhow::bail;
 use clap::builder::{TypedValueParser, ValueParserFactory};
 use clap::{command, Parser};
-use colored::Colorize;
+use owo_colors::OwoColorize;
 use path_absolutize::path_dedot;
 use regex::Regex;
 use rustc_hash::FxHashMap;
@@ -1053,7 +1053,6 @@ pub enum FormatRangeParseError {
 
 impl std::fmt::Display for FormatRangeParseError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let tip = "  tip:".bold().green();
         match self {
             FormatRangeParseError::StartGreaterThanEnd(start, end) => {
                 write!(
@@ -1062,7 +1061,8 @@ impl std::fmt::Display for FormatRangeParseError {
                     start_invalid=start.to_string().bold().yellow(),
                     end_invalid=end.to_string().bold().yellow(),
                     start=start.to_string().green().bold(),
-                    end=end.to_string().green().bold()
+                    end=end.to_string().green().bold(),
+                    tip="  tip:".bold().green()
                 )
             }
             FormatRangeParseError::InvalidStart(inner) => inner.write(f, true),
@@ -1148,7 +1148,8 @@ pub enum LineColumnParseError {
 
 impl LineColumnParseError {
     fn write(&self, f: &mut std::fmt::Formatter, start_range: bool) -> std::fmt::Result {
-        let tip = "tip:".bold().green();
+        let tip = "tip:".bold();
+        let tip = tip.green();
 
         let range = if start_range { "start" } else { "end" };
 

crates/ruff/src/commands/check.rs

@@ -4,9 +4,9 @@ use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use anyhow::Result;
-use colored::Colorize;
 use ignore::Error;
 use log::{debug, error, warn};
+use owo_colors::OwoColorize;
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use rustc_hash::FxHashMap;
@@ -226,6 +226,7 @@ mod test {
     use rustc_hash::FxHashMap;
     use tempfile::TempDir;
 
+    use ruff_linter::colors;
     use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
     use ruff_linter::registry::Rule;
     use ruff_linter::settings::types::UnsafeFixes;
@@ -280,7 +281,7 @@ mod test {
             UnsafeFixes::Enabled,
         )
         .unwrap();
-        let mut output = Vec::new();
+        let mut output = colors::none(Vec::new());
 
         TextEmitter::default()
             .with_show_fix_status(true)
@@ -291,7 +292,7 @@ mod test {
             )
             .unwrap();
 
-        let messages = String::from_utf8(output).unwrap();
+        let messages = String::from_utf8(output.into_inner()).unwrap();
 
         insta::with_settings!({
             omit_expression => true,

crates/ruff/src/commands/clean.rs

@@ -2,7 +2,7 @@ use std::fs::remove_dir_all;
 use std::io::{self, BufWriter, Write};
 
 use anyhow::Result;
-use colored::Colorize;
+use owo_colors::OwoColorize;
 use path_absolutize::path_dedot;
 use walkdir::WalkDir;
 

crates/ruff/src/commands/format.rs

@@ -6,16 +6,17 @@ use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use anyhow::Result;
-use colored::Colorize;
 use itertools::Itertools;
 use log::{error, warn};
+use owo_colors::OwoColorize;
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use rustc_hash::FxHashSet;
 use thiserror::Error;
 use tracing::debug;
 
 use ruff_diagnostics::SourceMap;
+use ruff_linter::colors;
 use ruff_linter::fs;
 use ruff_linter::logging::{DisplayParseError, LogLevel};
 use ruff_linter::registry::Rule;
@@ -189,20 +190,20 @@ pub(crate) fn format(
     match mode {
         FormatMode::Write => {}
         FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
+            results.write_changed(&mut colors::auto(stdout()).lock())?;
         }
         FormatMode::Diff => {
-            results.write_diff(&mut stdout().lock())?;
+            results.write_diff(&mut colors::auto(stdout()).lock())?;
         }
     }
 
     // Report on the formatting changes.
     if config_arguments.log_level >= LogLevel::Default {
         if mode.is_diff() {
             // Allow piping the diff to e.g. a file by writing the summary to stderr
-            results.write_summary(&mut stderr().lock())?;
+            results.write_summary(&mut colors::auto(stderr()).lock())?;
         } else {
-            results.write_summary(&mut stdout().lock())?;
+            results.write_summary(&mut colors::auto(stdout()).lock())?;
         }
     }
 

crates/ruff/src/commands/format_stdin.rs

@@ -4,6 +4,7 @@ use std::path::Path;
 use anyhow::Result;
 use log::error;
 
+use ruff_linter::colors;
 use ruff_linter::source_kind::SourceKind;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{match_exclusion, python_file_at_path, Resolver};
@@ -111,7 +112,7 @@ fn format_source_code(
     match &formatted {
         FormattedSource::Formatted(formatted) => match mode {
             FormatMode::Write => {
-                let mut writer = stdout().lock();
+                let mut writer = colors::auto(stdout()).lock();
                 formatted
                     .write(&mut writer)
                     .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
@@ -120,7 +121,7 @@ fn format_source_code(
             FormatMode::Diff => {
                 use std::io::Write;
                 write!(
-                    &mut stdout().lock(),
+                    &mut colors::auto(stdout()).lock(),
                     "{}",
                     source_kind.diff(formatted, path).unwrap()
                 )
@@ -130,7 +131,7 @@ fn format_source_code(
         FormattedSource::Unchanged => {
             // Write to stdout regardless of whether the source was formatted
             if mode.is_write() {
-                let mut writer = stdout().lock();
+                let mut writer = colors::auto(stdout()).lock();
                 source_kind
                     .write(&mut writer)
                     .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;

crates/ruff/src/diagnostics.rs

@@ -8,11 +8,12 @@ use std::ops::{Add, AddAssign};
 use std::path::Path;
 
 use anyhow::{Context, Result};
-use colored::Colorize;
 use log::{debug, error, warn};
+use owo_colors::OwoColorize;
 use rustc_hash::FxHashMap;
 
 use ruff_diagnostics::Diagnostic;
+use ruff_linter::colors;
 use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult, ParseSource};
 use ruff_linter::logging::DisplayParseError;
 use ruff_linter::message::Message;
@@ -444,7 +445,7 @@ pub(crate) fn lint_stdin(
                     // But only write a diff if it's non-empty.
                     if !fixed.is_empty() {
                         write!(
-                            &mut io::stdout().lock(),
+                            &mut colors::auto(io::stdout()).lock(),
                             "{}",
                             source_kind.diff(&transformed, path).unwrap()
                         )?;

crates/ruff/src/lib.rs

@@ -10,10 +10,11 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use args::{GlobalConfigArgs, ServerCommand};
 use clap::CommandFactory;
-use colored::Colorize;
 use log::warn;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
+use owo_colors::OwoColorize;
 
+use ruff_linter::colors;
 use ruff_linter::logging::{set_up_logging, LogLevel};
 use ruff_linter::settings::flags::FixMode;
 use ruff_linter::settings::types::SerializationFormat;
@@ -145,10 +146,6 @@ pub fn run(
         }));
     }
 
-    // Enabled ANSI colors on Windows 10.
-    #[cfg(windows)]
-    assert!(colored::control::set_virtual_terminal(true).is_ok());
-
     set_up_logging(global_options.log_level())?;
 
     if let Some(deprecated_alias_warning) = deprecated_alias_warning {
@@ -225,13 +222,12 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
 
     let mut writer: Box<dyn Write> = match cli.output_file {
         Some(path) if !cli.watch => {
-            colored::control::set_override(false);
             let file = File::create(path)?;
-            Box::new(BufWriter::new(file))
+            Box::new(BufWriter::new(colors::none(file)))
         }
-        _ => Box::new(BufWriter::new(io::stdout())),
+        _ => Box::new(BufWriter::new(colors::auto(io::stdout()))),
     };
-    let stderr_writer = Box::new(BufWriter::new(io::stderr()));
+    let stderr_writer = Box::new(BufWriter::new(colors::auto(io::stderr())));
 
     let is_stdin = is_stdin(&cli.files, cli.stdin_filename.as_deref());
     let files = resolve_default_files(cli.files, is_stdin);

crates/ruff/src/main.rs

@@ -1,7 +1,8 @@
 use std::process::ExitCode;
 
+use anstream::eprintln;
 use clap::{Parser, Subcommand};
-use colored::Colorize;
+use owo_colors::OwoColorize;
 
 use ruff::args::{Args, Command};
 use ruff::{run, ExitStatus};

crates/ruff/src/printer.rs

@@ -5,8 +5,8 @@ use std::io::Write;
 
 use anyhow::Result;
 use bitflags::bitflags;
-use colored::Colorize;
 use itertools::{iterate, Itertools};
+use owo_colors::OwoColorize;
 use serde::Serialize;
 
 use ruff_linter::fs::relativize_path;