From db1fba0fbfa1215e1221ddb9db73706062ddfc6e Mon Sep 17 00:00:00 2001 From: Alexander Sergeev Date: Fri, 23 Jun 2023 22:00:00 +0000 Subject: [PATCH 1/2] Use only colors supported by conhost.exe --- src/benchmark/mod.rs | 32 ++++++++++++++++---------------- src/benchmark/scheduler.rs | 12 ++++++------ src/main.rs | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/benchmark/mod.rs b/src/benchmark/mod.rs index 0699f7d..5a4e47a 100644 --- a/src/benchmark/mod.rs +++ b/src/benchmark/mod.rs @@ -231,7 +231,7 @@ impl<'a> Benchmark<'a> { let msg = { let mean = format_duration(mean(×_real), self.options.time_unit); - format!("Current estimate: {}", mean.to_string().green()) + format!("Current estimate: {}", mean.to_string().yellow().bold()) }; if let Some(bar) = progress_bar.as_ref() { @@ -285,31 +285,31 @@ impl<'a> Benchmark<'a> { if times_real.len() == 1 { println!( " Time ({} ≡): {:>8} {:>8} [User: {}, System: {}]", - "abs".green().bold(), - mean_str.green().bold(), + "abs".yellow().bold(), + mean_str.yellow().bold(), " ", // alignment - user_str.blue(), - system_str.blue() + user_str.cyan(), + system_str.cyan() ); } else { let stddev_str = format_duration(t_stddev.unwrap(), Some(time_unit)); println!( " Time ({} ± {}): {:>8} ± {:>8} [User: {}, System: {}]", - "mean".green().bold(), - "σ".green(), - mean_str.green().bold(), - stddev_str.green(), - user_str.blue(), - system_str.blue() + "mean".yellow().bold(), + "σ", + mean_str.yellow().bold(), + stddev_str, + user_str.cyan(), + system_str.cyan() ); println!( " Range ({} … {}): {:>8} … {:>8} {}", - "min".cyan(), - "max".purple(), - min_str.cyan(), - max_str.purple(), + "min".bright_yellow().bold(), + "max".bright_red(), + min_str.bright_green(), + max_str.bright_red(), num_str.dimmed() ); } @@ -357,7 +357,7 @@ impl<'a> Benchmark<'a> { eprintln!(" "); for warning in &warnings { - eprintln!(" {}: {}", "Warning".yellow(), warning); + eprintln!(" {}: {}", "Warning".yellow().bold(), warning); } } diff --git a/src/benchmark/scheduler.rs b/src/benchmark/scheduler.rs index 62f3e63..d497b7f 100644 --- a/src/benchmark/scheduler.rs +++ b/src/benchmark/scheduler.rs @@ -84,13 +84,13 @@ impl<'a> Scheduler<'a> { for item in others { println!( "{}{} times faster than {}", - format!("{:8.2}", item.relative_speed).bold().green(), + format!("{:8.2}", item.relative_speed).yellow().bold(), if let Some(stddev) = item.relative_speed_stddev { - format!(" ± {}", format!("{:.2}", stddev).green()) + format!(" ± {}", format!("{:.2}", stddev).yellow().bold()) } else { "".into() }, - &item.result.command_with_unused_parameters.magenta() + &item.result.command_with_unused_parameters.cyan() ); } } @@ -100,11 +100,11 @@ impl<'a> Scheduler<'a> { for item in annotated_results { println!( " {}{} {}", - format!("{:10.2}", item.relative_speed).bold().green(), + format!("{:10.2}", item.relative_speed).yellow().bold(), if item.is_fastest { " ".into() } else if let Some(stddev) = item.relative_speed_stddev { - format!(" ± {}", format!("{:5.2}", stddev).green()) + format!(" ± {}", format!("{:5.2}", stddev).yellow().bold()) } else { " ".into() }, @@ -121,7 +121,7 @@ impl<'a> Scheduler<'a> { Try to re-run the benchmark on a quiet system. If you did not do so already, try the \ --shell=none/-N option. If it does not help either, you command is most likely too fast \ to be accurately benchmarked by hyperfine.", - "Note".bold().red() + "Note".bright_red() ); } } diff --git a/src/main.rs b/src/main.rs index a75d4bd..bd8b179 100644 --- a/src/main.rs +++ b/src/main.rs @@ -50,7 +50,7 @@ fn main() { match run() { Ok(_) => {} Err(e) => { - eprintln!("{} {:#}", "Error:".red(), e); + eprintln!("{} {:#}", "Error:".bright_red(), e); std::process::exit(1); } } From 866f2054b2f25a08e2efdad2fdd899fb88e45c71 Mon Sep 17 00:00:00 2001 From: Alexander Sergeev Date: Sat, 24 Jun 2023 09:53:58 +0000 Subject: [PATCH 2/2] Change min label color --- src/benchmark/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/benchmark/mod.rs b/src/benchmark/mod.rs index 5a4e47a..405de7d 100644 --- a/src/benchmark/mod.rs +++ b/src/benchmark/mod.rs @@ -306,7 +306,7 @@ impl<'a> Benchmark<'a> { println!( " Range ({} … {}): {:>8} … {:>8} {}", - "min".bright_yellow().bold(), + "min".bright_green(), "max".bright_red(), min_str.bright_green(), max_str.bright_red(),