Merge pull request #1192 from tmccombs/ansi-term-deprecated

Use nu-ansi-term instead of ansi-term
sharkdp · Dec 2, 2022 · 6e3eb26 · 6e3eb26
2 parents 4a66d8f + d441516
commit 6e3eb26
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,7 @@ path = "src/main.rs"
 version_check = "0.9"
 
 [dependencies]
-ansi_term = "0.12"
+nu-ansi-term = "0.46"
 argmax = "0.3.1"
 atty = "0.2"
 ignore = "0.4.3"
@@ -42,7 +42,6 @@ regex = "1.7.0"
 regex-syntax = "0.6"
 ctrlc = "3.2"
 humantime = "2.1"
-lscolors = "0.12"
 globset = "0.4"
 anyhow = "1.0"
 dirs-next = "2.0"
@@ -57,6 +56,11 @@ faccess = "0.2.4"
 version = "4.0.22"
 features = ["suggestions", "color", "wrap_help", "cargo", "unstable-grouped", "derive"]
 
+[dependencies.lscolors]
+version = "0.13"
+default-features = false
+features = ["nu-ansi-term"]
+
 [target.'cfg(unix)'.dependencies]
 users = "0.11.0"
 nix = { version = "0.24.2", default-features = false, features = ["signal"] }

diff --git a/src/main.rs b/src/main.rs
@@ -212,7 +212,7 @@ fn construct_config(mut opts: Opts, pattern_regexps: &[String]) -> Result<Config
 
     #[cfg(windows)]
     let ansi_colors_support =
-        ansi_term::enable_ansi_support().is_ok() || std::env::var_os("TERM").is_some();
+        nu_ansi_term::enable_ansi_support().is_ok() || std::env::var_os("TERM").is_some();
     #[cfg(not(windows))]
     let ansi_colors_support = true;
 

diff --git a/src/output.rs b/src/output.rs
@@ -46,7 +46,7 @@ fn print_trailing_slash<W: Write>(
             stdout,
             "{}",
             style
-                .map(Style::to_ansi_term_style)
+                .map(Style::to_nu_ansi_term_style)
                 .unwrap_or_default()
                 .paint(&config.actual_path_separator)
         )?;
@@ -85,14 +85,14 @@ fn print_entry_colorized<W: Write>(
 
         let style = ls_colors
             .style_for_indicator(Indicator::Directory)
-            .map(Style::to_ansi_term_style)
+            .map(Style::to_nu_ansi_term_style)
             .unwrap_or_default();
         write!(stdout, "{}", style.paint(parent_str))?;
     }
 
     let style = entry
         .style(ls_colors)
-        .map(Style::to_ansi_term_style)
+        .map(Style::to_nu_ansi_term_style)
         .unwrap_or_default();
     write!(stdout, "{}", style.paint(&path_str[offset..]))?;