diff options
author | nickelc <constantin.nickel@gmail.com> | 2023-03-10 14:13:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-10 08:13:20 -0500 |
commit | 164213501db1bfad829f9dadbc5e4cea8e8f4d40 (patch) | |
tree | 60176ca6153d549130764e209f259424120f303a /src | |
parent | b2f4704d2807eaa04b75df999b05f21b3d248d2a (diff) |
Derive the default for enums with `#[derive(Default)]`/`#[default]` (#1341)
Diffstat (limited to 'src')
-rw-r--r-- | src/cli.rs | 24 | ||||
-rw-r--r-- | src/utils/bat/output.rs | 3 |
2 files changed, 6 insertions, 21 deletions
@@ -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 index 96baa0e2..de02b18e 100644 --- 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::*; |