Derive the default for enums with #[derive(Default)]/#[default] (#…

…1341)
dandavison · Mar 10, 2023 · 1642135 · 1642135
1 parent b2f4704
commit 1642135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/src/cli.rs b/src/cli.rs
@@ -1117,36 +1117,20 @@ pub struct ComputedValues {
     pub true_color: bool,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub enum Width {
     Fixed(usize),
+    #[default]
     Variable,
 }
 
-impl Default for Width {
-    fn default() -> Self {
-        Width::Variable
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub enum InspectRawLines {
     True,
+    #[default]
     False,
 }
 
-impl Default for InspectRawLines {
-    fn default() -> Self {
-        InspectRawLines::False
-    }
-}
-
-impl Default for PagingMode {
-    fn default() -> Self {
-        PagingMode::Never
-    }
-}
-
 impl Opt {
     pub fn from_args_and_git_config(
         env: DeltaEnv,

diff --git a/src/utils/bat/output.rs b/src/utils/bat/output.rs
@@ -13,11 +13,12 @@ use crate::env::DeltaEnv;
 use crate::fatal;
 use crate::features::navigate;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 #[allow(dead_code)]
 pub enum PagingMode {
     Always,
     QuitIfOneScreen,
+    #[default]
     Never,
 }
 use crate::errors::*;