From c2d66af72f5b38d450fa15d0e5d8382d5308b93c Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sat, 11 Mar 2023 01:20:46 -0500 Subject: [PATCH] clippy: appease clippy as of Rust 1.68.0 (#1055) * clippy: fix derivable_impls clippy warning This was done using `cargo clippy --fix` * cargo fmt after autofix --- src/app.rs | 9 ++------- src/app/data_harvester/temperature.rs | 9 ++------- src/app/layout_manager.rs | 9 ++------- src/components/data_table/state.rs | 9 ++------- src/data_conversion.rs | 9 ++------- src/units/data_units.rs | 9 ++------- 6 files changed, 12 insertions(+), 42 deletions(-) diff --git a/src/app.rs b/src/app.rs index 123f991b..9c3a37fd 100644 --- a/src/app.rs +++ b/src/app.rs @@ -33,18 +33,13 @@ pub mod states; use frozen_state::FrozenState; -#[derive(Debug, Clone, Eq, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq, Default)] pub enum AxisScaling { + #[default] Log, Linear, } -impl Default for AxisScaling { - fn default() -> Self { - AxisScaling::Log - } -} - /// AppConfigFields is meant to cover basic fields that would normally be set /// by config files or launch options. #[derive(Debug, Default, Eq, PartialEq)] diff --git a/src/app/data_harvester/temperature.rs b/src/app/data_harvester/temperature.rs index 82cf38f4..4ad76232 100644 --- a/src/app/data_harvester/temperature.rs +++ b/src/app/data_harvester/temperature.rs @@ -24,19 +24,14 @@ pub struct TempHarvest { pub temperature: f32, } -#[derive(Clone, Debug, Copy, PartialEq, Eq)] +#[derive(Clone, Debug, Copy, PartialEq, Eq, Default)] pub enum TemperatureType { + #[default] Celsius, Kelvin, Fahrenheit, } -impl Default for TemperatureType { - fn default() -> Self { - TemperatureType::Celsius - } -} - fn convert_celsius_to_kelvin(celsius: f32) -> f32 { celsius + 273.15 } diff --git a/src/app/layout_manager.rs b/src/app/layout_manager.rs index fab2d918..abc60899 100644 --- a/src/app/layout_manager.rs +++ b/src/app/layout_manager.rs @@ -882,8 +882,9 @@ pub struct BottomWidget { pub bottom_right_corner: Option<(u16, u16)>, } -#[derive(Debug, Clone, Eq, PartialEq, Hash)] +#[derive(Debug, Clone, Eq, PartialEq, Hash, Default)] pub enum BottomWidgetType { + #[default] Empty, Cpu, CpuLegend, @@ -927,12 +928,6 @@ impl BottomWidgetType { } } -impl Default for BottomWidgetType { - fn default() -> Self { - BottomWidgetType::Empty - } -} - impl std::str::FromStr for BottomWidgetType { type Err = BottomError; diff --git a/src/components/data_table/state.rs b/src/components/data_table/state.rs index 7398d54a..0e2ed450 100644 --- a/src/components/data_table/state.rs +++ b/src/components/data_table/state.rs @@ -1,20 +1,15 @@ use tui::{layout::Rect, widgets::TableState}; -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)] pub enum ScrollDirection { // UP means scrolling up --- this usually DECREMENTS Up, // DOWN means scrolling down --- this usually INCREMENTS + #[default] Down, } -impl Default for ScrollDirection { - fn default() -> Self { - ScrollDirection::Down - } -} - /// Internal state representation of a [`DataTable`](super::DataTable). pub struct DataTableState { /// The index from where to start displaying the rows. diff --git a/src/data_conversion.rs b/src/data_conversion.rs index d6ea25a4..a27663e3 100644 --- a/src/data_conversion.rs +++ b/src/data_conversion.rs @@ -13,19 +13,14 @@ use crate::units::data_units::DataUnit; use crate::utils::gen_util::*; use crate::widgets::{DiskWidgetData, TempWidgetData}; -#[derive(Debug)] +#[derive(Debug, Default)] pub enum BatteryDuration { ToEmpty(i64), ToFull(i64), + #[default] Unknown, } -impl Default for BatteryDuration { - fn default() -> Self { - BatteryDuration::Unknown - } -} - #[derive(Default, Debug)] pub struct ConvertedBatteryData { pub battery_name: String, diff --git a/src/units/data_units.rs b/src/units/data_units.rs index ff9e8ebb..df404732 100644 --- a/src/units/data_units.rs +++ b/src/units/data_units.rs @@ -1,11 +1,6 @@ -#[derive(Debug, Clone, Eq, PartialEq)] +#[derive(Debug, Clone, Eq, PartialEq, Default)] pub enum DataUnit { Byte, + #[default] Bit, } - -impl Default for DataUnit { - fn default() -> Self { - DataUnit::Bit - } -}