Use unwrap_or_default() when getting default color and verbosity (#2397)

src/color.rs

@@ -32,10 +32,7 @@ impl Color {
   }
 
   pub(crate) fn auto() -> Self {
-    Self {
-      use_color: UseColor::Auto,
-      ..Self::default()
-    }
+    Self::default()
   }
 
   #[cfg(test)]

src/run.rs

@@ -18,7 +18,7 @@ pub fn run(args: impl Iterator<Item = impl Into<OsString> + Clone>) -> Result<()
   let (color, verbosity) = config
     .as_ref()
     .map(|config| (config.color, config.verbosity))
-    .unwrap_or((Color::auto(), Verbosity::default()));
+    .unwrap_or_default();
 
   let loader = Loader::new();
 

src/verbosity.rs

@@ -1,6 +1,4 @@
-use Verbosity::*;
-
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
 pub(crate) enum Verbosity {
   Quiet,
   Taciturn,
@@ -11,35 +9,35 @@ pub(crate) enum Verbosity {
 impl Verbosity {
   pub(crate) fn from_flag_occurrences(flag_occurrences: u8) -> Self {
     match flag_occurrences {
-      0 => Taciturn,
-      1 => Loquacious,
-      _ => Grandiloquent,
+      0 => Self::Taciturn,
+      1 => Self::Loquacious,
+      _ => Self::Grandiloquent,
     }
   }
 
   pub(crate) fn quiet(self) -> bool {
-    matches!(self, Quiet)
+    self == Self::Quiet
   }
 
   pub(crate) fn loud(self) -> bool {
     !self.quiet()
   }
 
   pub(crate) fn loquacious(self) -> bool {
-    match self {
-      Quiet | Taciturn => false,
-      Loquacious | Grandiloquent => true,
-    }
+    self >= Self::Loquacious
   }
 
   pub(crate) fn grandiloquent(self) -> bool {
-    match self {
-      Quiet | Taciturn | Loquacious => false,
-      Grandiloquent => true,
-    }
+    self >= Self::Grandiloquent
   }
 
   pub const fn default() -> Self {
-    Taciturn
+    Self::Taciturn
+  }
+}
+
+impl Default for Verbosity {
+  fn default() -> Self {
+    Self::default()
   }
 }