From 6ac5df904b984396d860c0f95d1d80fb18cf7db3 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sun, 4 Sep 2022 18:44:54 +0200 Subject: [PATCH] refactor: replace `ansi_term` with `nu_ansi_term` (#4339) --- CONTRIBUTING.md | 2 +- Cargo.lock | 27 +++++++++++------- Cargo.toml | 2 +- src/config.rs | 46 +++++++++++++++---------------- src/formatter/string_formatter.rs | 4 +-- src/logger.rs | 2 +- src/main.rs | 2 +- src/module.rs | 28 +++++++++---------- src/modules/aws.rs | 2 +- src/modules/azure.rs | 2 +- src/modules/battery.rs | 2 +- src/modules/buf.rs | 2 +- src/modules/bun.rs | 2 +- src/modules/c.rs | 2 +- src/modules/character.rs | 2 +- src/modules/cmake.rs | 2 +- src/modules/cmd_duration.rs | 6 ++-- src/modules/cobol.rs | 2 +- src/modules/conda.rs | 2 +- src/modules/container.rs | 2 +- src/modules/crystal.rs | 2 +- src/modules/custom.rs | 2 +- src/modules/daml.rs | 2 +- src/modules/dart.rs | 2 +- src/modules/deno.rs | 2 +- src/modules/directory.rs | 2 +- src/modules/docker_context.rs | 2 +- src/modules/dotnet.rs | 2 +- src/modules/elixir.rs | 2 +- src/modules/elm.rs | 2 +- src/modules/env_var.rs | 2 +- src/modules/erlang.rs | 2 +- src/modules/fill.rs | 2 +- src/modules/gcloud.rs | 2 +- src/modules/git_branch.rs | 2 +- src/modules/git_commit.rs | 2 +- src/modules/git_metrics.rs | 2 +- src/modules/git_state.rs | 2 +- src/modules/git_status.rs | 4 +-- src/modules/golang.rs | 2 +- src/modules/haskell.rs | 2 +- src/modules/helm.rs | 2 +- src/modules/hg_branch.rs | 2 +- src/modules/hostname.rs | 2 +- src/modules/java.rs | 2 +- src/modules/jobs.rs | 2 +- src/modules/julia.rs | 2 +- src/modules/kotlin.rs | 2 +- src/modules/kubernetes.rs | 2 +- src/modules/localip.rs | 2 +- src/modules/lua.rs | 2 +- src/modules/nim.rs | 2 +- src/modules/nix_shell.rs | 2 +- src/modules/nodejs.rs | 2 +- src/modules/ocaml.rs | 2 +- src/modules/openstack.rs | 2 +- src/modules/package.rs | 2 +- src/modules/perl.rs | 2 +- src/modules/php.rs | 2 +- src/modules/pulumi.rs | 2 +- src/modules/purescript.rs | 2 +- src/modules/python.rs | 2 +- src/modules/raku.rs | 2 +- src/modules/red.rs | 2 +- src/modules/rlang.rs | 2 +- src/modules/ruby.rs | 2 +- src/modules/scala.rs | 2 +- src/modules/shell.rs | 2 +- src/modules/shlvl.rs | 2 +- src/modules/singularity.rs | 2 +- src/modules/spack.rs | 2 +- src/modules/status.rs | 2 +- src/modules/sudo.rs | 2 +- src/modules/swift.rs | 2 +- src/modules/terraform.rs | 2 +- src/modules/vagrant.rs | 2 +- src/modules/vcsh.rs | 2 +- src/modules/vlang.rs | 2 +- src/modules/zig.rs | 2 +- src/print.rs | 8 +++--- src/segment.rs | 22 +++++++-------- 81 files changed, 149 insertions(+), 142 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f21f9422..5942b538 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -180,7 +180,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/Cargo.lock b/Cargo.lock index 230ea10d..2c8bb7df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,15 +37,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.62" @@ -1757,6 +1748,16 @@ dependencies = [ "zvariant_derive", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -1903,6 +1904,12 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking" version = "2.0.0" @@ -2661,7 +2668,6 @@ dependencies = [ name = "starship" version = "1.10.2" dependencies = [ - "ansi_term", "chrono", "clap", "clap_complete", @@ -2679,6 +2685,7 @@ dependencies = [ "mockall", "nix 0.25.0", "notify-rust", + "nu-ansi-term", "once_cell", "open", "os_info", diff --git a/Cargo.toml b/Cargo.toml index 1c85bd6b..68565f1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,6 @@ config-schema = ["schemars"] notify = ["notify-rust"] [dependencies] -ansi_term = "0.12.1" chrono = { version = "0.4.22", features = ["clock", "std"] } clap = { version = "=3.2.20", features = ["derive", "cargo", "unicode", "unstable-v4"] } clap_complete = "3.2.4" @@ -51,6 +50,7 @@ log = { version = "0.4.16", features = ["std"] } # nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix # see: https://github.com/NixOS/nixpkgs/issues/160876 notify-rust = { version = "4.5.8", optional = true } +nu-ansi-term = "0.46.0" once_cell = "1.13.1" open = "3.0.2" os_info = "3.5.0" diff --git a/src/config.rs b/src/config.rs index faeba829..af882dea 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,6 @@ use crate::serde_utils::ValueDeserializer; use crate::utils; -use ansi_term::Color; +use nu_ansi_term::Color; use serde::{ de::value::Error as ValueError, de::Error as SerdeError, Deserialize, Deserializer, Serialize, }; @@ -251,7 +251,7 @@ impl StarshipConfig { } /// Deserialize a style string in the starship format with serde -pub fn deserialize_style<'de, D>(de: D) -> Result +pub fn deserialize_style<'de, D>(de: D) -> Result where D: Deserializer<'de>, { @@ -271,10 +271,10 @@ where - 'blink' - '' (see the `parse_color_string` doc for valid color strings) */ -pub fn parse_style_string(style_string: &str) -> Option { +pub fn parse_style_string(style_string: &str) -> Option { style_string .split_whitespace() - .fold(Some(ansi_term::Style::new()), |maybe_style, token| { + .fold(Some(nu_ansi_term::Style::new()), |maybe_style, token| { maybe_style.and_then(|style| { let token = token.to_lowercase(); @@ -333,7 +333,7 @@ pub fn parse_style_string(style_string: &str) -> Option { - u8 (a number from 0-255, representing an ANSI color) - colstring (one of the 16 predefined color strings) */ -fn parse_color_string(color_string: &str) -> Option { +fn parse_color_string(color_string: &str) -> Option { // Parse RGB hex values log::trace!("Parsing color_string: {}", color_string); if color_string.starts_with('#') { @@ -349,7 +349,7 @@ fn parse_color_string(color_string: &str) -> Option { let g: u8 = u8::from_str_radix(&color_string[3..5], 16).ok()?; let b: u8 = u8::from_str_radix(&color_string[5..7], 16).ok()?; log::trace!("Read RGB color string: {},{},{}", r, g, b); - return Some(Color::RGB(r, g, b)); + return Some(Color::Rgb(r, g, b)); } // Parse a u8 (ansi color) @@ -369,14 +369,14 @@ fn parse_color_string(color_string: &str) -> Option { "purple" => Some(Color::Purple), "cyan" => Some(Color::Cyan), "white" => Some(Color::White), - "bright-black" => Some(Color::Fixed(8)), // "bright-black" is dark grey - "bright-red" => Some(Color::Fixed(9)), - "bright-green" => Some(Color::Fixed(10)), - "bright-yellow" => Some(Color::Fixed(11)), - "bright-blue" => Some(Color::Fixed(12)), - "bright-purple" => Some(Color::Fixed(13)), - "bright-cyan" => Some(Color::Fixed(14)), - "bright-white" => Some(Color::Fixed(15)), + "bright-black" => Some(Color::DarkGray), // "bright-black" is dark grey + "bright-red" => Some(Color::LightRed), + "bright-green" => Some(Color::LightGreen), + "bright-yellow" => Some(Color::LightYellow), + "bright-blue" => Some(Color::LightBlue), + "bright-purple" => Some(Color::LightPurple), + "bright-cyan" => Some(Color::LightCyan), + "bright-white" => Some(Color::LightGray), _ => None, }; @@ -391,7 +391,7 @@ fn parse_color_string(color_string: &str) -> Option { #[cfg(test)] mod tests { use super::*; - use ansi_term::Style; + use nu_ansi_term::Style; // Small wrapper to allow deserializing Style without a struct with #[serde(deserialize_with=)] #[derive(Default, Clone, Debug, PartialEq)] @@ -574,7 +574,7 @@ mod tests { let config = Value::from("#a12BcD"); assert_eq!( ::from_config(&config).unwrap().0, - Color::RGB(0xA1, 0x2B, 0xCD).into() + Color::Rgb(0xA1, 0x2B, 0xCD).into() ); } @@ -600,7 +600,7 @@ mod tests { assert!(mystyle.is_dimmed); assert_eq!( mystyle, - ansi_term::Style::new() + nu_ansi_term::Style::new() .bold() .italic() .underline() @@ -620,7 +620,7 @@ mod tests { assert!(mystyle.is_reverse); assert_eq!( mystyle, - ansi_term::Style::new() + nu_ansi_term::Style::new() .bold() .italic() .underline() @@ -641,7 +641,7 @@ mod tests { assert!(mystyle.is_blink); assert_eq!( mystyle, - ansi_term::Style::new() + nu_ansi_term::Style::new() .bold() .italic() .underline() @@ -662,7 +662,7 @@ mod tests { assert!(mystyle.is_hidden); assert_eq!( mystyle, - ansi_term::Style::new() + nu_ansi_term::Style::new() .bold() .italic() .underline() @@ -683,7 +683,7 @@ mod tests { assert!(mystyle.is_strikethrough); assert_eq!( mystyle, - ansi_term::Style::new() + nu_ansi_term::Style::new() .bold() .italic() .underline() @@ -698,7 +698,7 @@ mod tests { // Test a "plain" style with no formatting let config = Value::from(""); let plain_style = ::from_config(&config).unwrap().0; - assert_eq!(plain_style, ansi_term::Style::new()); + assert_eq!(plain_style, nu_ansi_term::Style::new()); // Test a string that's clearly broken let config = Value::from("djklgfhjkldhlhk;j"); @@ -763,7 +763,7 @@ mod tests { Style::new() .underline() .fg(Color::Fixed(120)) - .on(Color::RGB(5, 5, 5)) + .on(Color::Rgb(5, 5, 5)) ); // Test that the last color style is always the one used diff --git a/src/formatter/string_formatter.rs b/src/formatter/string_formatter.rs index 3755edc7..8cce8f4e 100644 --- a/src/formatter/string_formatter.rs +++ b/src/formatter/string_formatter.rs @@ -1,4 +1,4 @@ -use ansi_term::Style; +use nu_ansi_term::Style; use pest::error::Error as PestError; use rayon::prelude::*; use std::borrow::Cow; @@ -465,7 +465,7 @@ where #[cfg(test)] mod tests { use super::*; - use ansi_term::Color; + use nu_ansi_term::Color; // match_next(result: IterMut, value, style) macro_rules! match_next { diff --git a/src/logger.rs b/src/logger.rs index 82d8e97f..d7ff11f8 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -1,6 +1,6 @@ use crate::utils; -use ansi_term::Color; use log::{Level, LevelFilter, Metadata, Record}; +use nu_ansi_term::Color; use once_cell::sync::OnceCell; use std::{ collections::HashSet, diff --git a/src/main.rs b/src/main.rs index 0e4ba653..7ffb1588 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,7 +114,7 @@ enum Commands { fn main() { // Configure the current terminal on windows to support ANSI escape sequences. #[cfg(windows)] - let _ = ansi_term::enable_ansi_support(); + let _ = nu_ansi_term::enable_ansi_support(); logger::init(); init_global_threadpool(); diff --git a/src/module.rs b/src/module.rs index e5b89625..c83947e2 100644 --- a/src/module.rs +++ b/src/module.rs @@ -2,7 +2,7 @@ use crate::context::Shell; use crate::segment; use crate::segment::{FillSegment, Segment}; use crate::utils::wrap_colorseq_for_shell; -use ansi_term::{ANSIString, ANSIStrings}; +use nu_ansi_term::{AnsiString, AnsiStrings}; use std::fmt; use std::time::Duration; @@ -146,15 +146,15 @@ impl<'a> Module<'a> { self.segments.iter().map(segment::Segment::value).collect() } - /// Returns a vector of colored `ANSIString` elements to be later used with - /// `ANSIStrings()` to optimize ANSI codes - pub fn ansi_strings(&self) -> Vec { + /// Returns a vector of colored `AnsiString` elements to be later used with + /// `AnsiStrings()` to optimize ANSI codes + pub fn ansi_strings(&self) -> Vec { self.ansi_strings_for_shell(Shell::Unknown, None) } - pub fn ansi_strings_for_shell(&self, shell: Shell, width: Option) -> Vec { + pub fn ansi_strings_for_shell(&self, shell: Shell, width: Option) -> Vec { let mut iter = self.segments.iter().peekable(); - let mut ansi_strings: Vec = Vec::new(); + let mut ansi_strings: Vec = Vec::new(); while iter.peek().is_some() { ansi_strings.extend(ansi_line(&mut iter, width)); } @@ -171,27 +171,27 @@ impl<'a> Module<'a> { impl<'a> fmt::Display for Module<'a> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let ansi_strings = self.ansi_strings(); - write!(f, "{}", ANSIStrings(&ansi_strings)) + write!(f, "{}", AnsiStrings(&ansi_strings)) } } -fn ansi_strings_modified(ansi_strings: Vec, shell: Shell) -> Vec { +fn ansi_strings_modified(ansi_strings: Vec, shell: Shell) -> Vec { ansi_strings .into_iter() .map(|ansi| { let wrapped = wrap_colorseq_for_shell(ansi.to_string(), shell); - ANSIString::from(wrapped) + AnsiString::from(wrapped) }) - .collect::>() + .collect::>() } -fn ansi_line<'a, I>(segments: &mut I, term_width: Option) -> Vec> +fn ansi_line<'a, I>(segments: &mut I, term_width: Option) -> Vec> where I: Iterator, { let mut used = 0usize; - let mut current: Vec = Vec::new(); - let mut chunks: Vec<(Vec, &FillSegment)> = Vec::new(); + let mut current: Vec = Vec::new(); + let mut chunks: Vec<(Vec, &FillSegment)> = Vec::new(); for segment in segments { match segment { @@ -223,7 +223,7 @@ where .chain(std::iter::once(fill.ansi_string(fill_size))) }) .chain(current.into_iter()) - .collect::>() + .collect::>() } } diff --git a/src/modules/aws.rs b/src/modules/aws.rs index fa83c611..0768a0f4 100644 --- a/src/modules/aws.rs +++ b/src/modules/aws.rs @@ -248,7 +248,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{create_dir, File}; use std::io::{self, Write}; diff --git a/src/modules/azure.rs b/src/modules/azure.rs index 87bb351d..5cb2b52e 100644 --- a/src/modules/azure.rs +++ b/src/modules/azure.rs @@ -108,8 +108,8 @@ fn parse_json(json_file_path: &Path) -> Option { mod tests { use crate::modules::azure::parse_json; use crate::test::ModuleRenderer; - use ansi_term::Color; use ini::Ini; + use nu_ansi_term::Color; use std::fs::File; use std::io::{self, Write}; use std::path::PathBuf; diff --git a/src/modules/battery.rs b/src/modules/battery.rs index 1e4cc05a..0800b2d4 100644 --- a/src/modules/battery.rs +++ b/src/modules/battery.rs @@ -172,7 +172,7 @@ impl BatteryInfoProvider for BatteryInfoProviderImpl { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn no_battery_status() { diff --git a/src/modules/buf.rs b/src/modules/buf.rs index cae5b9c5..177aa46d 100644 --- a/src/modules/buf.rs +++ b/src/modules/buf.rs @@ -64,7 +64,7 @@ fn parse_buf_version(buf_version: &str) -> Option { mod tests { use super::parse_buf_version; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/bun.rs b/src/modules/bun.rs index b3675bf1..e2ebf164 100644 --- a/src/modules/bun.rs +++ b/src/modules/bun.rs @@ -71,7 +71,7 @@ fn parse_bun_version(bun_version: String) -> String { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/c.rs b/src/modules/c.rs index 960acdd2..b8aa3b0e 100644 --- a/src/modules/c.rs +++ b/src/modules/c.rs @@ -92,7 +92,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::{test::ModuleRenderer, utils::CommandOutput}; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/character.rs b/src/modules/character.rs index f4d9a2ac..7fd19c8e 100644 --- a/src/modules/character.rs +++ b/src/modules/character.rs @@ -82,7 +82,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { mod test { use crate::context::Shell; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn success_status() { diff --git a/src/modules/cmake.rs b/src/modules/cmake.rs index 60ae3de2..81ad8e0c 100644 --- a/src/modules/cmake.rs +++ b/src/modules/cmake.rs @@ -71,7 +71,7 @@ fn parse_cmake_version(cmake_version: &str) -> Option { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/cmd_duration.rs b/src/modules/cmd_duration.rs index 2735e6c8..dcea1973 100644 --- a/src/modules/cmd_duration.rs +++ b/src/modules/cmd_duration.rs @@ -66,13 +66,13 @@ fn undistract_me<'a, 'b>( config: &'b CmdDurationConfig, elapsed: u128, ) -> Module<'a> { - use ansi_term::{unstyle, ANSIStrings}; use notify_rust::{Notification, Timeout}; + use nu_ansi_term::{unstyle, AnsiStrings}; if config.show_notifications && config.min_time_to_notify as u128 <= elapsed { let body = format!( "Command execution {}", - unstyle(&ANSIStrings(&module.ansi_strings())) + unstyle(&AnsiStrings(&module.ansi_strings())) ); let timeout = match config.notification_timeout { @@ -98,7 +98,7 @@ fn undistract_me<'a, 'b>( #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn config_blank_duration_1s() { diff --git a/src/modules/cobol.rs b/src/modules/cobol.rs index d19983f3..a5fc9726 100644 --- a/src/modules/cobol.rs +++ b/src/modules/cobol.rs @@ -75,7 +75,7 @@ fn get_cobol_version(cobol_stdout: &str) -> Option { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/conda.rs b/src/modules/conda.rs index 01a7f01f..fef82c89 100644 --- a/src/modules/conda.rs +++ b/src/modules/conda.rs @@ -54,7 +54,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn not_in_env() { diff --git a/src/modules/container.rs b/src/modules/container.rs index 9feba3d2..6f550b7e 100644 --- a/src/modules/container.rs +++ b/src/modules/container.rs @@ -101,7 +101,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::path::PathBuf; #[test] diff --git a/src/modules/crystal.rs b/src/modules/crystal.rs index cb283bb4..fcd53580 100644 --- a/src/modules/crystal.rs +++ b/src/modules/crystal.rs @@ -72,7 +72,7 @@ fn parse_crystal_version(crystal_version: &str) -> Option { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/custom.rs b/src/modules/custom.rs index 56790f66..d963e69e 100644 --- a/src/modules/custom.rs +++ b/src/modules/custom.rs @@ -268,7 +268,7 @@ mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/daml.rs b/src/modules/daml.rs index e9957227..1784ccd3 100644 --- a/src/modules/daml.rs +++ b/src/modules/daml.rs @@ -75,7 +75,7 @@ fn read_sdk_version_from_daml_yaml(context: &Context) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io::{Result, Write}; diff --git a/src/modules/dart.rs b/src/modules/dart.rs index 8df6307b..abdd3037 100644 --- a/src/modules/dart.rs +++ b/src/modules/dart.rs @@ -73,7 +73,7 @@ fn parse_dart_version(dart_version: &str) -> Option { mod tests { use crate::test::ModuleRenderer; use crate::utils::CommandOutput; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/deno.rs b/src/modules/deno.rs index a226fbc9..fc2c672b 100644 --- a/src/modules/deno.rs +++ b/src/modules/deno.rs @@ -70,7 +70,7 @@ fn parse_deno_version(deno_version: &str) -> Option { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/directory.rs b/src/modules/directory.rs index 99c9b8ad..be778bb0 100644 --- a/src/modules/directory.rs +++ b/src/modules/directory.rs @@ -345,7 +345,7 @@ mod tests { use crate::test::ModuleRenderer; use crate::utils::create_command; use crate::utils::home_dir; - use ansi_term::Color; + use nu_ansi_term::Color; #[cfg(not(target_os = "windows"))] use std::os::unix::fs::symlink; #[cfg(target_os = "windows")] diff --git a/src/modules/docker_context.rs b/src/modules/docker_context.rs index 08b72ed7..8ad5713d 100644 --- a/src/modules/docker_context.rs +++ b/src/modules/docker_context.rs @@ -91,7 +91,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io::{self, Write}; diff --git a/src/modules/dotnet.rs b/src/modules/dotnet.rs index 3f52bba6..5902e3cf 100644 --- a/src/modules/dotnet.rs +++ b/src/modules/dotnet.rs @@ -352,7 +352,7 @@ mod tests { use super::*; use crate::test::ModuleRenderer; use crate::utils::create_command; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, OpenOptions}; use std::io::{self, Write}; use tempfile::{self, TempDir}; diff --git a/src/modules/elixir.rs b/src/modules/elixir.rs index f6d5c91c..8fb7ccdd 100644 --- a/src/modules/elixir.rs +++ b/src/modules/elixir.rs @@ -91,7 +91,7 @@ fn parse_elixir_version(version: &str) -> Option<(String, String)> { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/elm.rs b/src/modules/elm.rs index 09564ab7..61838058 100644 --- a/src/modules/elm.rs +++ b/src/modules/elm.rs @@ -59,7 +59,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/env_var.rs b/src/modules/env_var.rs index c2cf828c..1e9a09d2 100644 --- a/src/modules/env_var.rs +++ b/src/modules/env_var.rs @@ -105,7 +105,7 @@ fn get_env_value(context: &Context, name: &str, default: Option<&str>) -> Option #[cfg(test)] mod test { use crate::test::ModuleRenderer; - use ansi_term::{Color, Style}; + use nu_ansi_term::{Color, Style}; const TEST_VAR_VALUE: &str = "astronauts"; diff --git a/src/modules/erlang.rs b/src/modules/erlang.rs index 4d3be6d7..e84dc361 100644 --- a/src/modules/erlang.rs +++ b/src/modules/erlang.rs @@ -73,7 +73,7 @@ fn get_erlang_version(context: &Context) -> Option { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/fill.rs b/src/modules/fill.rs index d77eb7ce..bf9558ef 100644 --- a/src/modules/fill.rs +++ b/src/modules/fill.rs @@ -24,7 +24,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn basic() { diff --git a/src/modules/gcloud.rs b/src/modules/gcloud.rs index 37f39f5d..dd8fab63 100644 --- a/src/modules/gcloud.rs +++ b/src/modules/gcloud.rs @@ -146,7 +146,7 @@ mod tests { use std::fs::{create_dir, File}; use std::io::{self, Write}; - use ansi_term::Color; + use nu_ansi_term::Color; use crate::test::ModuleRenderer; diff --git a/src/modules/git_branch.rs b/src/modules/git_branch.rs index 46591d62..f6dfddbc 100644 --- a/src/modules/git_branch.rs +++ b/src/modules/git_branch.rs @@ -120,7 +120,7 @@ fn get_first_grapheme(text: &str) -> &str { #[cfg(test)] mod tests { - use ansi_term::Color; + use nu_ansi_term::Color; use std::io; use crate::test::{fixture_repo, FixtureProvider, ModuleRenderer}; diff --git a/src/modules/git_commit.rs b/src/modules/git_commit.rs index 60f8793e..19e5eb16 100644 --- a/src/modules/git_commit.rs +++ b/src/modules/git_commit.rs @@ -78,7 +78,7 @@ fn git_hash(repo: &Repo, config: &GitCommitConfig) -> Option { #[cfg(test)] mod tests { - use ansi_term::Color; + use nu_ansi_term::Color; use std::{io, str}; use crate::test::{fixture_repo, FixtureProvider, ModuleRenderer}; diff --git a/src/modules/git_metrics.rs b/src/modules/git_metrics.rs index bcec0406..51229a7e 100644 --- a/src/modules/git_metrics.rs +++ b/src/modules/git_metrics.rs @@ -116,7 +116,7 @@ mod tests { use std::path::{Path, PathBuf}; use std::process::Stdio; - use ansi_term::Color; + use nu_ansi_term::Color; use crate::test::ModuleRenderer; diff --git a/src/modules/git_state.rs b/src/modules/git_state.rs index 92727933..4b6cfc6d 100644 --- a/src/modules/git_state.rs +++ b/src/modules/git_state.rs @@ -157,7 +157,7 @@ struct StateDescription<'a> { #[cfg(test)] mod tests { - use ansi_term::Color; + use nu_ansi_term::Color; use std::ffi::OsStr; use std::fs::OpenOptions; use std::io::{self, Error, ErrorKind, Write}; diff --git a/src/modules/git_status.rs b/src/modules/git_status.rs index aa3f0387..ca6cedcd 100644 --- a/src/modules/git_status.rs +++ b/src/modules/git_status.rs @@ -470,7 +470,7 @@ fn git_status_wsl(_context: &Context, _conf: &GitStatusConfig) -> Option #[cfg(test)] mod tests { - use ansi_term::{ANSIStrings, Color}; + use nu_ansi_term::{AnsiStrings, Color}; use std::ffi::OsStr; use std::fs::{self, File}; use std::io::{self, prelude::*}; @@ -832,7 +832,7 @@ mod tests { .collect(); let expected = Some(format!( "{} ", - ANSIStrings(&[ + AnsiStrings(&[ Color::Red.bold().paint("[+"), Color::Green.paint("1"), Color::Red.bold().paint("]"), diff --git a/src/modules/golang.rs b/src/modules/golang.rs index c623e2b3..12ed6dbe 100644 --- a/src/modules/golang.rs +++ b/src/modules/golang.rs @@ -78,7 +78,7 @@ fn parse_go_version(go_stdout: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/haskell.rs b/src/modules/haskell.rs index afdb6ed3..957290b0 100644 --- a/src/modules/haskell.rs +++ b/src/modules/haskell.rs @@ -87,7 +87,7 @@ fn is_stack_project(context: &Context) -> bool { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; use std::io::Write; diff --git a/src/modules/helm.rs b/src/modules/helm.rs index b0997709..317f7c9b 100644 --- a/src/modules/helm.rs +++ b/src/modules/helm.rs @@ -83,7 +83,7 @@ fn parse_helm_version(helm_stdout: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/hg_branch.rs b/src/modules/hg_branch.rs index aa048a57..365983e4 100644 --- a/src/modules/hg_branch.rs +++ b/src/modules/hg_branch.rs @@ -98,7 +98,7 @@ fn graphemes_len(text: &str) -> usize { #[cfg(test)] mod tests { - use ansi_term::{Color, Style}; + use nu_ansi_term::{Color, Style}; use std::fs; use std::io; use std::path::Path; diff --git a/src/modules/hostname.rs b/src/modules/hostname.rs index fdb99194..004cb7a5 100644 --- a/src/modules/hostname.rs +++ b/src/modules/hostname.rs @@ -78,7 +78,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::{Color, Style}; + use nu_ansi_term::{Color, Style}; use unicode_segmentation::UnicodeSegmentation; macro_rules! get_hostname { diff --git a/src/modules/java.rs b/src/modules/java.rs index 36ba777e..e6f4162d 100644 --- a/src/modules/java.rs +++ b/src/modules/java.rs @@ -90,7 +90,7 @@ fn parse_java_version(java_version_string: &str) -> Option { mod tests { use super::*; use crate::{test::ModuleRenderer, utils::CommandOutput}; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/jobs.rs b/src/modules/jobs.rs index acc48b17..c24d4010 100644 --- a/src/modules/jobs.rs +++ b/src/modules/jobs.rs @@ -100,7 +100,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod test { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn config_blank_job_0() { diff --git a/src/modules/julia.rs b/src/modules/julia.rs index 646ec456..e15c86e2 100644 --- a/src/modules/julia.rs +++ b/src/modules/julia.rs @@ -76,7 +76,7 @@ fn parse_julia_version(julia_stdout: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/kotlin.rs b/src/modules/kotlin.rs index d4c054c6..8939656f 100644 --- a/src/modules/kotlin.rs +++ b/src/modules/kotlin.rs @@ -82,7 +82,7 @@ fn parse_kotlin_version(kotlin_stdout: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/kubernetes.rs b/src/modules/kubernetes.rs index a8449a20..29deeb38 100644 --- a/src/modules/kubernetes.rs +++ b/src/modules/kubernetes.rs @@ -212,7 +212,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::env; use std::fs::{create_dir, File}; use std::io::{self, Write}; diff --git a/src/modules/localip.rs b/src/modules/localip.rs index 47d899ba..b5385105 100644 --- a/src/modules/localip.rs +++ b/src/modules/localip.rs @@ -61,7 +61,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::{Color, Style}; + use nu_ansi_term::{Color, Style}; macro_rules! get_localip { () => { diff --git a/src/modules/lua.rs b/src/modules/lua.rs index 271f5558..761dcf9b 100644 --- a/src/modules/lua.rs +++ b/src/modules/lua.rs @@ -80,7 +80,7 @@ fn parse_lua_version(lua_version: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/nim.rs b/src/modules/nim.rs index 1b6c9fd3..b08a71f5 100644 --- a/src/modules/nim.rs +++ b/src/modules/nim.rs @@ -71,7 +71,7 @@ fn parse_nim_version(version_cmd_output: &str) -> Option<&str> { mod tests { use super::parse_nim_version; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/nix_shell.rs b/src/modules/nix_shell.rs index 3b006558..c3cba422 100644 --- a/src/modules/nix_shell.rs +++ b/src/modules/nix_shell.rs @@ -63,7 +63,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn no_env_variables() { diff --git a/src/modules/nodejs.rs b/src/modules/nodejs.rs index 46e8079d..a8c0baac 100644 --- a/src/modules/nodejs.rs +++ b/src/modules/nodejs.rs @@ -117,7 +117,7 @@ fn check_engines_version(nodejs_version: &str, engines_version: Option) #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; use std::io::Write; diff --git a/src/modules/ocaml.rs b/src/modules/ocaml.rs index 512d7b73..f947e03c 100644 --- a/src/modules/ocaml.rs +++ b/src/modules/ocaml.rs @@ -112,7 +112,7 @@ fn parse_opam_switch(opam_switch: &str) -> Option { mod tests { use super::{parse_opam_switch, SwitchType}; use crate::{test::ModuleRenderer, utils::CommandOutput}; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/openstack.rs b/src/modules/openstack.rs index 40087442..253f6917 100644 --- a/src/modules/openstack.rs +++ b/src/modules/openstack.rs @@ -86,7 +86,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io::{self, Write}; diff --git a/src/modules/package.rs b/src/modules/package.rs index 17eeb502..f278b64b 100644 --- a/src/modules/package.rs +++ b/src/modules/package.rs @@ -341,7 +341,7 @@ fn format_version(version: &str, version_format: &str) -> Option { mod tests { use super::*; use crate::{test::ModuleRenderer, utils::CommandOutput}; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; use std::io::Write; diff --git a/src/modules/perl.rs b/src/modules/perl.rs index 5051fda3..5068cf33 100644 --- a/src/modules/perl.rs +++ b/src/modules/perl.rs @@ -60,7 +60,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/php.rs b/src/modules/php.rs index 81ab232f..0a68ff09 100644 --- a/src/modules/php.rs +++ b/src/modules/php.rs @@ -59,7 +59,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/pulumi.rs b/src/modules/pulumi.rs index 5b2f975d..c8eae4e7 100644 --- a/src/modules/pulumi.rs +++ b/src/modules/pulumi.rs @@ -208,7 +208,7 @@ mod tests { use super::*; use crate::context::Target; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn pulumi_version_release() { diff --git a/src/modules/purescript.rs b/src/modules/purescript.rs index f2b8a4d0..b46ba573 100644 --- a/src/modules/purescript.rs +++ b/src/modules/purescript.rs @@ -58,7 +58,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/python.rs b/src/modules/python.rs index 6def1821..d22e8fe4 100644 --- a/src/modules/python.rs +++ b/src/modules/python.rs @@ -133,7 +133,7 @@ fn get_prompt_from_venv(venv_path: &Path) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{create_dir_all, File}; use std::io; use std::io::Write; diff --git a/src/modules/raku.rs b/src/modules/raku.rs index 377d4959..0e37b364 100644 --- a/src/modules/raku.rs +++ b/src/modules/raku.rs @@ -101,7 +101,7 @@ fn parse_raku_version(version: &str) -> Option<(String, String)> { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/red.rs b/src/modules/red.rs index 9b9a611e..f90ee7a9 100644 --- a/src/modules/red.rs +++ b/src/modules/red.rs @@ -58,7 +58,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/rlang.rs b/src/modules/rlang.rs index ee8c5d44..e0e14e15 100644 --- a/src/modules/rlang.rs +++ b/src/modules/rlang.rs @@ -73,7 +73,7 @@ fn parse_r_version(r_version: &str) -> Option { mod tests { use super::parse_r_version; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs; use std::fs::File; use std::io; diff --git a/src/modules/ruby.rs b/src/modules/ruby.rs index e9245ae7..e34e8948 100644 --- a/src/modules/ruby.rs +++ b/src/modules/ruby.rs @@ -85,7 +85,7 @@ fn format_ruby_version(ruby_version: &str, version_format: &str) -> Option Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io; diff --git a/src/modules/shell.rs b/src/modules/shell.rs index 3bc2929a..c9b6df15 100644 --- a/src/modules/shell.rs +++ b/src/modules/shell.rs @@ -66,7 +66,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { mod tests { use crate::context::Shell; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn test_none_if_disabled() { diff --git a/src/modules/shlvl.rs b/src/modules/shlvl.rs index e095d635..1e1e3cae 100644 --- a/src/modules/shlvl.rs +++ b/src/modules/shlvl.rs @@ -63,7 +63,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { - use ansi_term::{Color, Style}; + use nu_ansi_term::{Color, Style}; use crate::test::ModuleRenderer; diff --git a/src/modules/singularity.rs b/src/modules/singularity.rs index 1f7685a2..d8306af9 100644 --- a/src/modules/singularity.rs +++ b/src/modules/singularity.rs @@ -43,7 +43,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn no_env_set() { diff --git a/src/modules/spack.rs b/src/modules/spack.rs index 1ef6d1a8..b0067a3e 100644 --- a/src/modules/spack.rs +++ b/src/modules/spack.rs @@ -49,7 +49,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn not_in_env() { diff --git a/src/modules/status.rs b/src/modules/status.rs index 444b5a30..c202eea7 100644 --- a/src/modules/status.rs +++ b/src/modules/status.rs @@ -225,7 +225,7 @@ fn status_signal_name(signal: SignalNumber) -> Option<&'static str> { #[cfg(test)] mod tests { - use ansi_term::Color; + use nu_ansi_term::Color; use crate::test::ModuleRenderer; diff --git a/src/modules/sudo.rs b/src/modules/sudo.rs index 044487dc..4dd0b526 100644 --- a/src/modules/sudo.rs +++ b/src/modules/sudo.rs @@ -51,7 +51,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::{test::ModuleRenderer, utils::CommandOutput}; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn test_sudo_not_cached() { diff --git a/src/modules/swift.rs b/src/modules/swift.rs index 470dac16..61141050 100644 --- a/src/modules/swift.rs +++ b/src/modules/swift.rs @@ -72,7 +72,7 @@ fn parse_swift_version(swift_version: &str) -> Option { mod tests { use super::parse_swift_version; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/terraform.rs b/src/modules/terraform.rs index 2c0bda04..3742e48e 100644 --- a/src/modules/terraform.rs +++ b/src/modules/terraform.rs @@ -101,7 +101,7 @@ fn parse_terraform_version(version: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::{self, File}; use std::io::{self, Write}; diff --git a/src/modules/vagrant.rs b/src/modules/vagrant.rs index 158137d0..ff3436bd 100644 --- a/src/modules/vagrant.rs +++ b/src/modules/vagrant.rs @@ -74,7 +74,7 @@ fn parse_vagrant_version(vagrant_stdout: &str) -> Option { mod tests { use super::*; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/vcsh.rs b/src/modules/vcsh.rs index 8d0a445d..e915c742 100644 --- a/src/modules/vcsh.rs +++ b/src/modules/vcsh.rs @@ -47,7 +47,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn not_in_env() { diff --git a/src/modules/vlang.rs b/src/modules/vlang.rs index 85ccb40f..833836cc 100644 --- a/src/modules/vlang.rs +++ b/src/modules/vlang.rs @@ -70,7 +70,7 @@ fn parse_v_version(v_version: &str) -> Option { mod tests { use super::parse_v_version; use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/modules/zig.rs b/src/modules/zig.rs index 4b46a5d4..50bc8583 100644 --- a/src/modules/zig.rs +++ b/src/modules/zig.rs @@ -59,7 +59,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { #[cfg(test)] mod tests { use crate::test::ModuleRenderer; - use ansi_term::Color; + use nu_ansi_term::Color; use std::fs::File; use std::io; diff --git a/src/print.rs b/src/print.rs index 67572cd3..aed249d9 100644 --- a/src/print.rs +++ b/src/print.rs @@ -1,5 +1,5 @@ -use ansi_term::ANSIStrings; use clap::{PossibleValue, ValueEnum}; +use nu_ansi_term::AnsiStrings; use rayon::prelude::*; use std::collections::BTreeSet; use std::fmt::{self, Debug, Write as FmtWrite}; @@ -119,7 +119,7 @@ pub fn get_prompt(context: Context) -> String { // continuation prompts normally do not include newlines, but they can writeln!(buf).unwrap(); } - write!(buf, "{}", ANSIStrings(&module_strings)).unwrap(); + write!(buf, "{}", AnsiStrings(&module_strings)).unwrap(); if context.target == Target::Right { // right prompts generally do not allow newlines @@ -163,7 +163,7 @@ pub fn timings(args: Properties) { .map(|module| ModuleTiming { name: String::from(module.get_name().as_str()), name_len: module.get_name().width_graphemes(), - value: ansi_term::ANSIStrings(&module.ansi_strings()) + value: nu_ansi_term::AnsiStrings(&module.ansi_strings()) .to_string() .replace('\n', "\\n"), duration: module.duration, @@ -212,7 +212,7 @@ pub fn explain(args: Properties) { .map(|module| { let value = module.get_segments().join(""); ModuleInfo { - value: ansi_term::ANSIStrings(&module.ansi_strings()).to_string(), + value: nu_ansi_term::AnsiStrings(&module.ansi_strings()).to_string(), value_len: value.width_graphemes() + format_duration(&module.duration).width_graphemes(), desc: module.get_description().clone(), diff --git a/src/segment.rs b/src/segment.rs index cab7835d..ff03ff4c 100644 --- a/src/segment.rs +++ b/src/segment.rs @@ -1,5 +1,5 @@ use crate::print::{Grapheme, UnicodeWidthGraphemes}; -use ansi_term::{ANSIString, Style}; +use nu_ansi_term::{AnsiString, Style}; use std::fmt; use unicode_segmentation::UnicodeSegmentation; @@ -14,11 +14,11 @@ pub struct TextSegment { } impl TextSegment { - // Returns the ANSIString of the segment value - fn ansi_string(&self) -> ANSIString { + // Returns the AnsiString of the segment value + fn ansi_string(&self) -> AnsiString { match self.style { Some(style) => style.paint(&self.value), - None => ANSIString::from(&self.value), + None => AnsiString::from(&self.value), } } } @@ -34,8 +34,8 @@ pub struct FillSegment { } impl FillSegment { - // Returns the ANSIString of the segment value, not including its prefix and suffix - pub fn ansi_string(&self, width: Option) -> ANSIString { + // Returns the AnsiString of the segment value, not including its prefix and suffix + pub fn ansi_string(&self, width: Option) -> AnsiString { let s = match width { Some(w) => self .value @@ -54,7 +54,7 @@ impl FillSegment { }; match self.style { Some(style) => style.paint(s), - None => ANSIString::from(s), + None => AnsiString::from(s), } } } @@ -62,7 +62,7 @@ impl FillSegment { #[cfg(test)] mod fill_seg_tests { use super::FillSegment; - use ansi_term::Color; + use nu_ansi_term::Color; #[test] fn ansi_string_width() { @@ -158,12 +158,12 @@ impl Segment { } } - // Returns the ANSIString of the segment value, not including its prefix and suffix - pub fn ansi_string(&self) -> ANSIString { + // Returns the AnsiString of the segment value, not including its prefix and suffix + pub fn ansi_string(&self) -> AnsiString { match self { Self::Fill(fs) => fs.ansi_string(None), Self::Text(ts) => ts.ansi_string(), - Self::LineTerm => ANSIString::from(LINE_TERMINATOR_STRING), + Self::LineTerm => AnsiString::from(LINE_TERMINATOR_STRING), } }