Skip to content

Commit 663e36e

Browse files
author
Roman Stingler
committed
replace unmaintained ansi_term with anssiterm due to https://osv.dev/vulnerability/RUSTSEC-2021-0139
closes Morganamilo#1294
1 parent a15bee7 commit 663e36e

12 files changed

+129
-137
lines changed

Diff for: Cargo.lock

+115-122
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ raur = "7.0.0"
2424
srcinfo = "1.2.0"
2525

2626

27-
ansi_term = "0.12.1"
27+
ansiterm = "0.12.2"
2828
anyhow = { version = "1.0.93", features = ["backtrace"] }
2929
chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
3030
dirs = "5.0.1"
@@ -54,7 +54,6 @@ tr = "0.1.10"
5454
unicode-width = "0.2.0"
5555
regex = "1.11.1"
5656
signal-hook = "0.3.17"
57-
once_cell = "1.20.2"
5857
bitflags = "2.6.0"
5958
toml = { version = "0.8.19", features = ["preserve_order"] }
6059

Diff for: src/config.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use std::str::FromStr;
1818
use alpm::{
1919
AnyDownloadEvent, AnyQuestion, Depend, DownloadEvent, DownloadResult, LogLevel, Question,
2020
};
21-
use ansi_term::Color::{Blue, Cyan, Green, Purple, Red, Yellow};
22-
use ansi_term::Style;
21+
use ansiterm::Color::{Blue, Cyan, Green, Purple, Red, Yellow};
22+
use ansiterm::Style;
2323
use anyhow::{anyhow, bail, ensure, Context, Error, Result};
2424

2525
use bitflags::bitflags;
@@ -136,7 +136,7 @@ impl Colors {
136136
code: Style::new().fg(Cyan),
137137
news_date: Style::new().fg(Cyan).bold(),
138138
old_version: Style::new().fg(Red),
139-
install_version: Style::new().fg(ansi_term::Color::Fixed(243)),
139+
install_version: Style::new().fg(ansiterm::Color::Fixed(243)),
140140
new_version: Style::new().fg(Green),
141141
number_menu: Style::new().fg(Purple),
142142
group: Style::new().fg(Blue).bold(),

Diff for: src/devel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::iter::FromIterator;
1414
use std::time::Duration;
1515

1616
use alpm_utils::{DbListExt, Target};
17-
use ansi_term::Style;
17+
use ansiterm::Style;
1818
use anyhow::{anyhow, bail, Context, Result};
1919
use aur_depends::Base;
2020
use futures::future::{join_all, select_ok, FutureExt};

Diff for: src/download.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::result::Result as StdResult;
1111

1212
use alpm::Version;
1313
use alpm_utils::{AsTarg, DbListExt, Targ};
14-
use ansi_term::Style;
14+
use ansiterm::Style;
1515
use anyhow::{bail, ensure, Context, Result};
1616
use aur_depends::AurBase;
1717

Diff for: src/fmt.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::repo;
88
use alpm::Ver;
99
use aur_depends::{Actions, Base};
1010

11-
use ansi_term::Style;
11+
use ansiterm::Style;
1212
use chrono::{Local, TimeZone, Utc};
1313
use tr::tr;
1414
use unicode_width::UnicodeWidthStr;
@@ -107,7 +107,7 @@ pub fn print_indent<S: AsRef<str>>(
107107
println!();
108108
}
109109

110-
use ansi_term::Color;
110+
use ansiterm::Color;
111111

112112
pub fn color_repo(enabled: bool, name: &str) -> String {
113113
if !enabled {

Diff for: src/info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::fmt::{date, opt, print_indent};
55
use crate::util::split_repo_aur_info;
66

77
use alpm_utils::Targ;
8-
use ansi_term::Style;
8+
use ansiterm::Style;
99
use anyhow::Error;
1010

1111
use globset::GlobSet;

Diff for: src/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::{args, exec, news, print_error, printtr, repo};
2727
use alpm::{Alpm, Depend, Version};
2828
use alpm_utils::depends::{satisfies, satisfies_nover, satisfies_provide, satisfies_provide_nover};
2929
use alpm_utils::{DbListExt, Targ};
30-
use ansi_term::Style;
30+
use ansiterm::Style;
3131
use anyhow::{bail, ensure, Context, Result};
3232
use aur_depends::{Actions, Base, Conflict, DepMissing, RepoPackage};
3333
use log::debug;

Diff for: src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use std::io::Write;
4848
use std::path::PathBuf;
4949
use std::process::Command;
5050

51-
use ansi_term::Style;
51+
use ansiterm::Style;
5252
use anyhow::{bail, Error, Result};
5353
use cini::Ini;
5454
use fmt::print_target;

Diff for: src/news.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::fmt::print_indent;
33

44
use std::str::Chars;
55

6-
use ansi_term::Style;
6+
use ansiterm::Style;
77
use anyhow::{bail, Result};
88
use htmlescape::decode_html;
99
use rss::Channel;

Diff for: src/repo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::path::{Path, PathBuf};
1313
use std::process::Command;
1414

1515
use alpm::{AlpmListMut, Db};
16-
use ansi_term::Style;
16+
use ansiterm::Style;
1717
use anyhow::{Context, Error, Result};
1818
use nix::unistd::{Gid, Uid, User};
1919
use tr::tr;

Diff for: src/search.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::fmt::{color_repo, print_indent};
66
use crate::util::{input, NumberMenu};
77
use crate::{info, printtr};
88

9-
use ansi_term::Style;
9+
use ansiterm::Style;
1010
use anyhow::{ensure, Context, Result};
1111
use indicatif::HumanBytes;
1212
use raur::{Raur, SearchBy};

0 commit comments

Comments
 (0)