chore(cargo): replace unmaintained ansi_term with nu-ansi-term

This commit is contained in:
link2xt
2024-09-01 10:47:08 +00:00
parent 9d47be0d8a
commit be73076e9e
7 changed files with 8 additions and 20 deletions

13
Cargo.lock generated
View File

@@ -110,15 +110,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" 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]] [[package]]
name = "anstream" name = "anstream"
version = "0.6.13" version = "0.6.13"
@@ -1251,7 +1242,6 @@ dependencies = [
name = "deltachat" name = "deltachat"
version = "1.142.11" version = "1.142.11"
dependencies = [ dependencies = [
"ansi_term",
"anyhow", "anyhow",
"async-broadcast", "async-broadcast",
"async-channel 2.3.1", "async-channel 2.3.1",
@@ -1290,6 +1280,7 @@ dependencies = [
"log", "log",
"mailparse", "mailparse",
"mime", "mime",
"nu-ansi-term",
"num-derive", "num-derive",
"num-traits", "num-traits",
"num_cpus", "num_cpus",
@@ -1370,11 +1361,11 @@ dependencies = [
name = "deltachat-repl" name = "deltachat-repl"
version = "1.142.11" version = "1.142.11"
dependencies = [ dependencies = [
"ansi_term",
"anyhow", "anyhow",
"deltachat", "deltachat",
"dirs", "dirs",
"log", "log",
"nu-ansi-term",
"rusqlite", "rusqlite",
"rustyline", "rustyline",
"tokio", "tokio",

View File

@@ -105,11 +105,11 @@ url = "2"
uuid = { version = "1", features = ["serde", "v4"] } uuid = { version = "1", features = ["serde", "v4"] }
[dev-dependencies] [dev-dependencies]
ansi_term = { workspace = true }
anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests. anyhow = { workspace = true, features = ["backtrace"] } # Enable `backtrace` feature in tests.
criterion = { version = "0.5.1", features = ["async_tokio"] } criterion = { version = "0.5.1", features = ["async_tokio"] }
futures-lite = { workspace = true } futures-lite = { workspace = true }
log = { workspace = true } log = { workspace = true }
nu-ansi-term = { workspace = true }
proptest = { version = "1", default-features = false, features = ["std"] } proptest = { version = "1", default-features = false, features = ["std"] }
tempfile = { workspace = true } tempfile = { workspace = true }
testdir = "0.9.0" testdir = "0.9.0"
@@ -159,7 +159,6 @@ harness = false
[workspace.dependencies] [workspace.dependencies]
anyhow = "1" anyhow = "1"
ansi_term = "0.12.1"
async-channel = "2.3.1" async-channel = "2.3.1"
base64 = "0.22" base64 = "0.22"
chrono = { version = "0.4.38", default-features = false } chrono = { version = "0.4.38", default-features = false }
@@ -170,6 +169,7 @@ futures = "0.3.30"
futures-lite = "2.3.0" futures-lite = "2.3.0"
libc = "0.2" libc = "0.2"
log = "0.4" log = "0.4"
nu-ansi-term = "0.46"
num-traits = "0.2" num-traits = "0.2"
once_cell = "1.18.0" once_cell = "1.18.0"
rand = "0.8" rand = "0.8"

View File

@@ -6,11 +6,11 @@ edition = "2021"
repository = "https://github.com/deltachat/deltachat-core-rust" repository = "https://github.com/deltachat/deltachat-core-rust"
[dependencies] [dependencies]
ansi_term = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
deltachat = { workspace = true, features = ["internals"]} deltachat = { workspace = true, features = ["internals"]}
dirs = "5" dirs = "5"
log = { workspace = true } log = { workspace = true }
nu-ansi-term = { workspace = true }
rusqlite = { workspace = true } rusqlite = { workspace = true }
rustyline = "14" rustyline = "14"
tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] } tokio = { workspace = true, features = ["fs", "rt-multi-thread", "macros"] }

View File

@@ -12,7 +12,6 @@ use std::borrow::Cow::{self, Borrowed, Owned};
use std::io::{self, Write}; use std::io::{self, Write};
use std::process::Command; use std::process::Command;
use ansi_term::Color;
use anyhow::{bail, Error}; use anyhow::{bail, Error};
use deltachat::chat::ChatId; use deltachat::chat::ChatId;
use deltachat::config; use deltachat::config;
@@ -22,6 +21,7 @@ use deltachat::qr_code_generator::get_securejoin_qr_svg;
use deltachat::securejoin::*; use deltachat::securejoin::*;
use deltachat::EventType; use deltachat::EventType;
use log::{error, info, warn}; use log::{error, info, warn};
use nu_ansi_term::Color;
use rustyline::completion::{Completer, FilenameCompleter, Pair}; use rustyline::completion::{Completer, FilenameCompleter, Pair};
use rustyline::error::ReadlineError; use rustyline::error::ReadlineError;
use rustyline::highlight::{Highlighter, MatchingBracketHighlighter}; use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};

View File

@@ -9,9 +9,6 @@ ignore = [
# <https://rustsec.org/advisories/RUSTSEC-2023-0071> # <https://rustsec.org/advisories/RUSTSEC-2023-0071>
"RUSTSEC-2023-0071", "RUSTSEC-2023-0071",
# Unmaintained ansi_term
"RUSTSEC-2021-0139",
# Unmaintained encoding # Unmaintained encoding
"RUSTSEC-2021-0153", "RUSTSEC-2021-0153",
] ]

View File

@@ -2890,7 +2890,7 @@ Hi."#;
bob.recv_msg(&sent_msg).await; bob.recv_msg(&sent_msg).await;
let contact = Contact::get_by_id(&bob, *contacts.first().unwrap()).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!( assert!(
contact.was_seen_recently(), contact.was_seen_recently(),
"{}", "{}",

View File

@@ -10,10 +10,10 @@ use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use ansi_term::Color;
use async_channel::{self as channel, Receiver, Sender}; use async_channel::{self as channel, Receiver, Sender};
use chat::ChatItem; use chat::ChatItem;
use deltachat_contact_tools::{ContactAddress, EmailAddress}; use deltachat_contact_tools::{ContactAddress, EmailAddress};
use nu_ansi_term::Color;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use rand::Rng; use rand::Rng;