From a0ea8fe22fc931ee0f9cd57acce2bbe49a45e22d Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 19 Jan 2023 18:04:43 +0200 Subject: [PATCH] Apply #[derive(Default)] fixes suggested by Clippy (#2000) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These were bugging me every time I ran `clippy` 😁 --- src/logging.rs | 9 ++------- src/rules/isort/types.rs | 9 ++------- src/source_code/stylist.rs | 18 ++++-------------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/logging.rs b/src/logging.rs index 867ee18158..418edb7b1b 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -44,13 +44,14 @@ macro_rules! notify_user { } } -#[derive(Debug, PartialOrd, Ord, PartialEq, Eq)] +#[derive(Debug, Default, PartialOrd, Ord, PartialEq, Eq)] pub enum LogLevel { // No output (+ `log::LevelFilter::Off`). Silent, // Only show lint violations, with no decorative output (+ `log::LevelFilter::Off`). Quiet, // All user-facing output (+ `log::LevelFilter::Info`). + #[default] Default, // All user-facing output (+ `log::LevelFilter::Debug`). Verbose, @@ -67,12 +68,6 @@ impl LogLevel { } } -impl Default for LogLevel { - fn default() -> Self { - LogLevel::Default - } -} - pub fn set_up_logging(level: &LogLevel) -> Result<()> { fern::Dispatch::new() .format(|out, message, record| { diff --git a/src/rules/isort/types.rs b/src/rules/isort/types.rs index b2202b7d0f..4ed3ef40d4 100644 --- a/src/rules/isort/types.rs +++ b/src/rules/isort/types.rs @@ -4,18 +4,13 @@ use rustc_hash::FxHashMap; use crate::ast; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)] pub enum TrailingComma { Present, + #[default] Absent, } -impl Default for TrailingComma { - fn default() -> Self { - TrailingComma::Absent - } -} - #[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq, Clone)] pub struct ImportFromData<'a> { pub module: Option<&'a str>, diff --git a/src/source_code/stylist.rs b/src/source_code/stylist.rs index 073b3d6042..3ce101e984 100644 --- a/src/source_code/stylist.rs +++ b/src/source_code/stylist.rs @@ -49,18 +49,13 @@ impl<'a> Stylist<'a> { } /// The quotation style used in Python source code. -#[derive(Debug, PartialEq, Eq)] +#[derive(Debug, Default, PartialEq, Eq)] pub enum Quote { Single, + #[default] Double, } -impl Default for Quote { - fn default() -> Self { - Quote::Double - } -} - impl From for char { fn from(val: Quote) -> Self { match val { @@ -123,19 +118,14 @@ impl Deref for Indentation { /// The line ending style used in Python source code. /// See -#[derive(Debug, PartialEq, Eq)] +#[derive(Debug, Default, PartialEq, Eq)] pub enum LineEnding { + #[default] Lf, Cr, CrLf, } -impl Default for LineEnding { - fn default() -> Self { - LineEnding::Lf - } -} - impl Deref for LineEnding { type Target = str;