diff --git a/src/gui/mod.rs b/src/gui/mod.rs index ca68ee9..a108560 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -373,13 +373,14 @@ fn load_icon() -> egui::IconData { } } +#[allow(clippy::unnecessary_wraps)] fn app_creator( cc: &eframe::CreationContext<'_>, ) -> Result, Box> { let mut app = Box::::default(); if let Some(persistent_state) = PersistentState::get() { app.launch.selected = persistent_state.launcher; - app.settings = persistent_state.settings.clone(); + app.settings = persistent_state.settings; }; let elevated = util::win::is_elevated(); if app.settings.start_elevated && !elevated { diff --git a/src/gui/persistent_state.rs b/src/gui/persistent_state.rs index 3ef91d8..bf0a08c 100644 --- a/src/gui/persistent_state.rs +++ b/src/gui/persistent_state.rs @@ -24,7 +24,7 @@ impl PersistentState { pub fn get() -> Option { fs::read_to_string(CONFIG_PATH.as_path()) .ok() - .and_then(|config| serde_json::from_str::(&config).ok()) + .and_then(|config| serde_json::from_str::(&config).ok()) } pub fn set(&self) { diff --git a/src/gui/settings.rs b/src/gui/settings.rs index 20b1246..6b61920 100644 --- a/src/gui/settings.rs +++ b/src/gui/settings.rs @@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize}; use std::fmt::Display; use strum::EnumIter; +#[allow(clippy::enum_variant_names)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, EnumIter)] pub enum Theme { CatppuccinLatte, @@ -10,9 +11,9 @@ pub enum Theme { CatppuccinMocha, } -impl Into for Theme { - fn into(self) -> catppuccin_egui::Theme { - match self { +impl From for catppuccin_egui::Theme { + fn from(val: Theme) -> Self { + match val { Theme::CatppuccinLatte => catppuccin_egui::LATTE, Theme::CatppuccinFrappe => catppuccin_egui::FRAPPE, Theme::CatppuccinMacchiato => catppuccin_egui::MACCHIATO, @@ -24,18 +25,18 @@ impl Into for Theme { impl Display for Theme { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let x = match self { - Theme::CatppuccinLatte => "Catppuccin Latte", - Theme::CatppuccinFrappe => "Catppuccin Frappe", - Theme::CatppuccinMacchiato => "Catppuccin Macchiato", - Theme::CatppuccinMocha => "Catppuccin Mocha", + Self::CatppuccinLatte => "Catppuccin Latte", + Self::CatppuccinFrappe => "Catppuccin Frappe", + Self::CatppuccinMacchiato => "Catppuccin Macchiato", + Self::CatppuccinMocha => "Catppuccin Mocha", }; write!(f, "{x}") } } impl Theme { - pub fn to_catppuccin(&self) -> catppuccin_egui::Theme { - (*self).into() + pub fn to_catppuccin(self) -> catppuccin_egui::Theme { + self.into() } }