From 6c5b807b397fa8417a1199c1dd1bde7ce231284a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Mon, 26 Jun 2023 16:25:47 +0300 Subject: [PATCH] chore(deps): switch to owo-colors for fixing RUSTSEC-2021-0145 https://github.com/mackwic/colored/issues/131 --- Cargo.lock | 39 +++++--------------------- systeroid-core/Cargo.toml | 2 +- systeroid-core/src/config.rs | 2 +- systeroid-core/src/sysctl/parameter.rs | 2 +- systeroid-core/src/tree.rs | 2 +- 5 files changed, 11 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 809c1d2..f0c9893 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,17 +41,6 @@ dependencies = [ "libc", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -132,17 +121,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - [[package]] name = "const-random" version = "0.1.15" @@ -443,15 +421,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -750,6 +719,12 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1072,10 +1047,10 @@ dependencies = [ name = "systeroid-core" version = "0.4.2" dependencies = [ - "colored", "dirs-next", "lazy_static", "log", + "owo-colors", "parseit", "rayon", "rust-ini", diff --git a/systeroid-core/Cargo.toml b/systeroid-core/Cargo.toml index 813a2de..986d687 100644 --- a/systeroid-core/Cargo.toml +++ b/systeroid-core/Cargo.toml @@ -18,7 +18,7 @@ sysctl = "0.5.4" thiserror = "1.0.40" lazy_static = "1.4.0" rayon = "1.7.0" -colored = "2.0.0" +owo-colors = "3.5.0" serde = { version = "1.0.164", features = ["derive"] } serde_json = "1.0.97" dirs-next = "2.0.0" diff --git a/systeroid-core/src/config.rs b/systeroid-core/src/config.rs index 447f565..5418548 100644 --- a/systeroid-core/src/config.rs +++ b/systeroid-core/src/config.rs @@ -1,8 +1,8 @@ use crate::error::Result; use crate::sysctl::r#type::{DisplayType, OutputType}; use crate::sysctl::section::Section; -use colored::Color; use ini::Ini; +use owo_colors::colored::Color; use std::collections::HashMap; use std::path::PathBuf; diff --git a/systeroid-core/src/sysctl/parameter.rs b/systeroid-core/src/sysctl/parameter.rs index 7e72cf5..4c9ba82 100644 --- a/systeroid-core/src/sysctl/parameter.rs +++ b/systeroid-core/src/sysctl/parameter.rs @@ -2,7 +2,7 @@ use crate::config::Config; use crate::error::Result; use crate::sysctl::r#type::DisplayType; use crate::sysctl::section::Section; -use colored::*; +use owo_colors::colored::*; use serde::{Deserialize, Serialize}; use std::fmt::Write as _; use std::io::Write; diff --git a/systeroid-core/src/tree.rs b/systeroid-core/src/tree.rs index cc745c2..e6847ea 100644 --- a/systeroid-core/src/tree.rs +++ b/systeroid-core/src/tree.rs @@ -1,4 +1,4 @@ -use colored::*; +use owo_colors::colored::*; use std::fmt::Display; use std::io::{Result as IoResult, Write};