diff --git a/Cargo.lock b/Cargo.lock index f1e7b7797..84da9ae8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,15 +110,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.13" @@ -1251,7 +1242,6 @@ dependencies = [ name = "deltachat" version = "1.142.11" dependencies = [ - "ansi_term", "anyhow", "async-broadcast", "async-channel 2.3.1", @@ -1290,6 +1280,7 @@ dependencies = [ "log", "mailparse", "mime", + "nu-ansi-term", "num-derive", "num-traits", "num_cpus", @@ -1370,11 +1361,11 @@ dependencies = [ name = "deltachat-repl" version = "1.142.11" dependencies = [ - "ansi_term", "anyhow", "deltachat", "dirs", "log", + "nu-ansi-term", "rusqlite", "rustyline", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 50000a591..eb6b23581 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,11 +105,11 @@ url = "2" uuid = { version = "1", features = ["serde", "v4"] } [dev-dependencies] -ansi_term = { workspace = true } anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests. criterion = { version = "0.5.1", features = ["async_tokio"] } futures-lite = { workspace = true } log = { workspace = true } +nu-ansi-term = { workspace = true } proptest = { version = "1", default-features = false, features = ["std"] } tempfile = { workspace = true } testdir = "0.9.0" @@ -159,7 +159,6 @@ harness = false [workspace.dependencies] anyhow = "1" -ansi_term = "0.12.1" async-channel = "2.3.1" base64 = "0.22" chrono = { version = "0.4.38", default-features = false } @@ -170,6 +169,7 @@ futures = "0.3.30" futures-lite = "2.3.0" libc = "0.2" log = "0.4" +nu-ansi-term = "0.46" num-traits = "0.2" once_cell = "1.18.0" rand = "0.8" diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index 4de00b872..8fdfcde6c 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" repository = "https://github.com/deltachat/deltachat-core-rust" [dependencies] -ansi_term = { workspace = true } anyhow = { workspace = true } deltachat = { workspace = true, features = ["internals"]} dirs = "5" log = { workspace = true } +nu-ansi-term = { workspace = true } rusqlite = { workspace = true } rustyline = "14" tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] } diff --git a/deltachat-repl/src/main.rs b/deltachat-repl/src/main.rs index 9881c4edf..05185c810 100644 --- a/deltachat-repl/src/main.rs +++ b/deltachat-repl/src/main.rs @@ -12,7 +12,6 @@ use std::borrow::Cow::{self, Borrowed, Owned}; use std::io::{self, Write}; use std::process::Command; -use ansi_term::Color; use anyhow::{bail, Error}; use deltachat::chat::ChatId; use deltachat::config; @@ -22,6 +21,7 @@ use deltachat::qr_code_generator::get_securejoin_qr_svg; use deltachat::securejoin::*; use deltachat::EventType; use log::{error, info, warn}; +use nu_ansi_term::Color; use rustyline::completion::{Completer, FilenameCompleter, Pair}; use rustyline::error::ReadlineError; use rustyline::highlight::{Highlighter, MatchingBracketHighlighter}; diff --git a/deny.toml b/deny.toml index 0bb9bde7d..81f545725 100644 --- a/deny.toml +++ b/deny.toml @@ -9,9 +9,6 @@ ignore = [ # "RUSTSEC-2023-0071", - # Unmaintained ansi_term - "RUSTSEC-2021-0139", - # Unmaintained encoding "RUSTSEC-2021-0153", ] diff --git a/src/contact.rs b/src/contact.rs index f52bffb9d..b6096ed9b 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -2890,7 +2890,7 @@ Hi."#; bob.recv_msg(&sent_msg).await; let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).await?; - let green = ansi_term::Color::Green.normal(); + let green = nu_ansi_term::Color::Green.normal(); assert!( contact.was_seen_recently(), "{}", diff --git a/src/test_utils.rs b/src/test_utils.rs index 5e0ceb44a..5d5ad6e2e 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -10,10 +10,10 @@ use std::path::Path; use std::sync::Arc; use std::time::{Duration, Instant}; -use ansi_term::Color; use async_channel::{self as channel, Receiver, Sender}; use chat::ChatItem; use deltachat_contact_tools::{ContactAddress, EmailAddress}; +use nu_ansi_term::Color; use once_cell::sync::Lazy; use pretty_assertions::assert_eq; use rand::Rng;