Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 10 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ rust-version = "1.85.0"
members = [".", "crates/*"]

[dependencies]
ansi_term = "0.12.0"
blake3 = { version = "1.5.0", features = ["rayon", "mmap"] }
camino = "1.0.4"
chrono = "0.4.38"
Expand All @@ -31,6 +30,7 @@ heck = "0.5.0"
is_executable = "1.0.4"
lexiclean = "0.0.1"
libc = "0.2.0"
nu-ansi-term = "0.50.3"
num_cpus = "1.15.0"
percent-encoding = "2.3.1"
rand = "0.10.0"
Expand Down
10 changes: 7 additions & 3 deletions src/color.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
use {
super::*,
ansi_term::{ANSIGenericString, Color::*, Prefix, Style, Suffix},
nu_ansi_term::{
AnsiGenericString,
Color::{Blue, Cyan, Green, Purple, Red, Yellow},
Prefix, Style, Suffix,
},
std::io::{self, IsTerminal},
};

Expand Down Expand Up @@ -44,7 +48,7 @@ impl Color {
self.restyle(Style::new().fg(Cyan).bold())
}

pub(crate) fn command(self, foreground: Option<ansi_term::Color>) -> Self {
pub(crate) fn command(self, foreground: Option<nu_ansi_term::Color>) -> Self {
self.restyle(Style {
foreground,
is_bold: true,
Expand Down Expand Up @@ -103,7 +107,7 @@ impl Color {
}
}

pub(crate) fn paint<'a>(&self, text: &'a str) -> ANSIGenericString<'a, str> {
pub(crate) fn paint<'a>(&self, text: &'a str) -> AnsiGenericString<'a, str> {
self.effective_style().paint(text)
}

Expand Down
2 changes: 1 addition & 1 deletion src/command_color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub(crate) enum CommandColor {
Yellow,
}

impl From<CommandColor> for ansi_term::Color {
impl From<CommandColor> for nu_ansi_term::Color {
fn from(command_color: CommandColor) -> Self {
match command_color {
CommandColor::Black => Self::Black,
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub(crate) struct Config {
pub(crate) ceiling: Option<PathBuf>,
pub(crate) check: bool,
pub(crate) color: Color,
pub(crate) command_color: Option<ansi_term::Color>,
pub(crate) command_color: Option<nu_ansi_term::Color>,
pub(crate) complete_aliases: bool,
pub(crate) cygpath: PathBuf,
pub(crate) dotenv_filename: Option<String>,
Expand Down
2 changes: 1 addition & 1 deletion src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::*;
#[allow(clippy::missing_errors_doc)]
pub fn run(args: impl Iterator<Item = impl Into<OsString> + Clone>) -> Result<(), i32> {
#[cfg(windows)]
ansi_term::enable_ansi_support().ok();
nu_ansi_term::enable_ansi_support().ok();

let arguments = Arguments::try_parse_from(args).map_err(|err| {
err.print().ok();
Expand Down
Loading