diff --git a/Cargo.lock b/Cargo.lock index 9cc97fceadc..8f14cb7fbf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7811,7 +7811,6 @@ dependencies = [ "chrono", "clap 4.5.50", "clap-markdown", - "colored", "convert_case 0.6.0", "dialoguer", "dirs", @@ -7832,6 +7831,7 @@ dependencies = [ "mimalloc", "names", "notify", + "owo-colors 4.2.3", "path-clean", "percent-encoding", "pretty_assertions", @@ -8791,12 +8791,12 @@ dependencies = [ "anyhow", "bytes", "clap 4.5.50", - "colored", "dialoguer", "flate2", "http-body-util", "indicatif", "log", + "owo-colors 4.2.3", "reqwest 0.12.24", "self-replace", "semver", diff --git a/Cargo.toml b/Cargo.toml index 120ec24c2cf..e6666d3fa04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -174,7 +174,7 @@ cargo_metadata = "0.17.0" chrono = { version = "0.4.24", default-features = false } clap = { version = "4.2.4", features = ["derive", "wrap_help"] } clap-markdown = "0.1.4" -colored = "2.0.0" +owo-colors = "4.2.3" console = { version = "0.15.6" } convert_case = "0.6.0" crc32c = "0.6.4" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index b2b8d7e1d89..5bde0a1870e 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -37,7 +37,7 @@ bytes.workspace = true cargo_metadata.workspace = true chrono.workspace = true clap = { workspace = true, features = ["derive", "env", "string"] } -colored.workspace = true +owo-colors.workspace = true convert_case.workspace = true dirs.workspace = true duct.workspace = true diff --git a/crates/cli/src/subcommands/dev.rs b/crates/cli/src/subcommands/dev.rs index 8badb72773a..138a1f69510 100644 --- a/crates/cli/src/subcommands/dev.rs +++ b/crates/cli/src/subcommands/dev.rs @@ -14,13 +14,13 @@ use crate::{publish, tasks}; use anyhow::Context; use clap::parser::ValueSource; use clap::{Arg, ArgMatches, Command}; -use colored::Colorize; use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input}; use futures::stream::{self, StreamExt}; use futures::{AsyncBufReadExt, TryStreamExt}; use ignore::gitignore::{Gitignore, GitignoreBuilder}; use indicatif::{ProgressBar, ProgressStyle}; use notify::{Event, RecommendedWatcher, RecursiveMode, Watcher}; +use owo_colors::OwoColorize; use regex::Regex; use serde::Deserialize; use serde_json::json; diff --git a/crates/cli/src/subcommands/init.rs b/crates/cli/src/subcommands/init.rs index 31d927720f1..b5ade825cac 100644 --- a/crates/cli/src/subcommands/init.rs +++ b/crates/cli/src/subcommands/init.rs @@ -3,9 +3,9 @@ use crate::Config; use anyhow::anyhow; use anyhow::Context; use clap::{Arg, ArgMatches}; -use colored::Colorize; use convert_case::{Case, Casing}; use dialoguer::{theme::ColorfulTheme, Confirm, FuzzySelect, Input, Select}; +use owo_colors::OwoColorize; use reqwest::Url; use serde::{Deserialize, Serialize}; use serde_json::json; diff --git a/crates/cli/src/subcommands/repl.rs b/crates/cli/src/subcommands/repl.rs index ed029a7f405..734afccb419 100644 --- a/crates/cli/src/subcommands/repl.rs +++ b/crates/cli/src/subcommands/repl.rs @@ -1,7 +1,7 @@ use crate::api::{ClientApi, Connection}; use crate::sql::run_sql; -use colored::*; use dirs::home_dir; +use owo_colors::OwoColorize; use std::env::temp_dir; use rustyline::completion::Completer; @@ -61,7 +61,7 @@ pub async fn exec(con: Connection) -> Result<(), anyhow::Error> { let api = ClientApi::new(con); loop { - let readline = rl.readline(&format!("🪐{}>", &database).green()); + let readline = rl.readline(&format!("🪐{}>", &database).green().to_string()); match readline { Ok(line) => match line.as_str() { ".exit" => break, diff --git a/crates/update/Cargo.toml b/crates/update/Cargo.toml index db8fac5ec37..96b1e1f7f7a 100644 --- a/crates/update/Cargo.toml +++ b/crates/update/Cargo.toml @@ -20,7 +20,7 @@ clap.workspace = true dialoguer = { workspace = true, default-features = false } flate2.workspace = true http-body-util = "0.1.2" -colored.workspace = true +owo-colors.workspace = true indicatif.workspace = true log.workspace = true reqwest.workspace = true diff --git a/crates/update/src/update_notice.rs b/crates/update/src/update_notice.rs index 3148061a64e..07d5f170ae0 100644 --- a/crates/update/src/update_notice.rs +++ b/crates/update/src/update_notice.rs @@ -7,7 +7,7 @@ use std::path::{Path, PathBuf}; use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use colored::Colorize; +use owo_colors::OwoColorize; use crate::cli::install::fetch_latest_release_version;