Merge pull request #398 from epage/concolor

chore: Upgrade concolor
This commit is contained in:
Ed Page 2022-01-11 16:19:29 -06:00 committed by GitHub
commit c73e96ce21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 11 deletions

29
Cargo.lock generated
View file

@ -256,13 +256,24 @@ dependencies = [
]
[[package]]
name = "concolor-clap"
version = "0.0.7"
name = "concolor"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14b1e2c32ce41369500cb16afec166bb78f8044ab18264802e679aeec6871039"
checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af"
dependencies = [
"atty",
"bitflags",
"concolor-query 0.0.5",
]
[[package]]
name = "concolor-clap"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "059a1172876f3c1a3a23247d9d79efaaaf2f27f40a776e54db820be8386be32a"
dependencies = [
"clap 3.0.0",
"concolor-control",
"concolor",
]
[[package]]
@ -273,7 +284,7 @@ checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da"
dependencies = [
"atty",
"bitflags",
"concolor-query",
"concolor-query 0.0.4",
]
[[package]]
@ -282,6 +293,12 @@ version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7"
[[package]]
name = "concolor-query"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449"
[[package]]
name = "content_inspector"
version = "0.2.4"
@ -1517,8 +1534,8 @@ dependencies = [
"bstr",
"clap 3.0.0",
"clap-verbosity-flag 0.4.0",
"concolor",
"concolor-clap",
"concolor-control",
"content_inspector",
"criterion",
"derive_more",

View file

@ -73,8 +73,8 @@ log = "0.4"
env_logger = { version = "0.9", default-features = false, features = ["termcolor"] }
atty = "0.2.14"
yansi = "0.5.0"
concolor-control = { version = "0.0.7" }
concolor-clap = { version = "0.0.7", features = ["api_unstable"] }
concolor = { version = "0.0.8" }
concolor-clap = { version = "0.0.8", features = ["api_unstable"] }
bstr = "0.2"
once_cell = "1.2.0"
ahash = "0.7"

View file

@ -31,12 +31,12 @@ fn run() -> proc_exit::ExitResult {
init_logging(args.verbose.log_level());
let stdout_palette = if concolor_control::get(concolor_control::Stream::Stdout).ansi_color() {
let stdout_palette = if concolor::get(concolor::Stream::Stdout).ansi_color() {
report::Palette::colored()
} else {
report::Palette::plain()
};
let stderr_palette = if concolor_control::get(concolor_control::Stream::Stderr).ansi_color() {
let stderr_palette = if concolor::get(concolor::Stream::Stderr).ansi_color() {
report::Palette::colored()
} else {
report::Palette::plain()
@ -266,7 +266,7 @@ fn init_logging(level: Option<log::Level>) {
if let Some(level) = level {
let mut builder = env_logger::Builder::new();
let colored = concolor_control::get(concolor_control::Stream::Stderr).ansi_color();
let colored = concolor::get(concolor::Stream::Stderr).ansi_color();
builder.write_style(if colored {
env_logger::WriteStyle::Always
} else {