From 3c5c201fa8033425c3065486cd1f2f648e49ea69 Mon Sep 17 00:00:00 2001 From: blinxen Date: Thu, 12 Mar 2026 00:08:54 +0100 Subject: [PATCH] Update terminal-colorsaurus to version 1.0.3 --- Cargo.lock | 19 ++----------------- Cargo.toml | 2 +- src/options/theme.rs | 12 ++++++------ 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d907cad47..1635a17fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ "shell-words", "syn", "syntect", - "terminal-colorsaurus 1.0.0", + "terminal-colorsaurus", "thiserror 2.0.17", "toml", "unicode-segmentation", @@ -739,7 +739,7 @@ dependencies = [ "smol_str", "syntect", "sysinfo", - "terminal-colorsaurus 0.4.8", + "terminal-colorsaurus", "unicode-segmentation", "unicode-width 0.1.14", "xdg", @@ -1726,21 +1726,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal-colorsaurus" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7afe4c174a3cbfb52ebcb11b28965daf74fe9111d4e07e40689d05af06e26e8" -dependencies = [ - "cfg-if", - "libc", - "memchr", - "mio 1.0.3", - "terminal-trx", - "windows-sys 0.59.0", - "xterm-color", -] - [[package]] name = "terminal-colorsaurus" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 91310c155..ea619eddb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ smol_str = "0.1.24" syntect = "5.0.0" # sysinfo: no default features to disable the use of threads sysinfo = { version = "0.29.0", default-features = false, features = [] } -terminal-colorsaurus = "0.4.8" +terminal-colorsaurus = "1" unicode-segmentation = "1.10.1" # 0.2.0 (and 0.1.13) treats \n as width 1. Lines processed by delta have, lose, # and re-gain \n in various stages, which complicates upgrading. diff --git a/src/options/theme.rs b/src/options/theme.rs index 215f49d3d..2f774d1ae 100644 --- a/src/options/theme.rs +++ b/src/options/theme.rs @@ -18,7 +18,7 @@ use std::io::{stdout, IsTerminal}; use bat; use bat::assets::HighlightingAssets; #[cfg(not(test))] -use terminal_colorsaurus::{color_scheme, QueryOptions}; +use terminal_colorsaurus::{theme_mode, QueryOptions}; use crate::cli::{self, DetectDarkLight}; use crate::color::{ColorMode, ColorMode::*}; @@ -103,16 +103,16 @@ fn should_detect_color_mode(opt: &cli::Opt) -> bool { #[cfg(not(test))] fn detect_color_mode() -> Option { - color_scheme(QueryOptions::default()) + theme_mode(QueryOptions::default()) .ok() .map(ColorMode::from) } -impl From for ColorMode { - fn from(value: terminal_colorsaurus::ColorScheme) -> Self { +impl From for ColorMode { + fn from(value: terminal_colorsaurus::ThemeMode) -> Self { match value { - terminal_colorsaurus::ColorScheme::Dark => ColorMode::Dark, - terminal_colorsaurus::ColorScheme::Light => ColorMode::Light, + terminal_colorsaurus::ThemeMode::Dark => ColorMode::Dark, + terminal_colorsaurus::ThemeMode::Light => ColorMode::Light, } } }