Make checks more concise

sharkdp · Feb 20, 2018 · 4829dfb · 4829dfb
1 parent faf00b6
commit 4829dfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/hyperfine/internal.rs b/src/hyperfine/internal.rs
@@ -67,14 +67,14 @@ impl Default for HyperfineOptions {
 pub fn get_progress_bar(length: u64, msg: &str, option: &OutputStyleOption) -> ProgressBar {
     let progressbar_style = match *option {
         OutputStyleOption::Basic => ProgressStyle::default_bar(),
-        OutputStyleOption::Full | OutputStyleOption::NoColor => ProgressStyle::default_spinner()
+        _ => ProgressStyle::default_spinner()
             .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
             .template(" {spinner} {msg:<30} {wide_bar} ETA {eta_precise}"),
     };
 
     let progress_bar = match *option {
         OutputStyleOption::Basic => ProgressBar::hidden(),
-        OutputStyleOption::Full | OutputStyleOption::NoColor => ProgressBar::new(length),
+        _ => ProgressBar::new(length),
     };
     progress_bar.set_style(progressbar_style.clone());
     progress_bar.enable_steady_tick(80);

diff --git a/src/main.rs b/src/main.rs
@@ -158,14 +158,12 @@ fn main() {
         },
     };
 
-    // We default Windows to NoColor if full or auto had been specified.
+    // We default Windows to NoColor if full had been specified.
     if cfg!(windows) && options.output_style == OutputStyleOption::Full {
         options.output_style = OutputStyleOption::NoColor;
     }
 
-    if options.output_style == OutputStyleOption::Basic
-        || options.output_style == OutputStyleOption::NoColor
-    {
+    if options.output_style != OutputStyleOption::Full {
         colored::control::set_override(false);
     }