From fdc220febc3fcc4f07ba1aac439763d0cf871701 Mon Sep 17 00:00:00 2001 From: Rudxain <76864299+Rudxain@users.noreply.github.com> Date: Thu, 6 Mar 2025 03:15:18 -0400 Subject: [PATCH] chore: fix/mute more lints; rm useless "TODO"s --- src/core/save.rs | 1 - src/core/uad_lists.rs | 1 - src/gui/mod.rs | 12 +++++------- src/gui/views/list.rs | 3 --- src/gui/views/settings.rs | 4 +--- src/gui/widgets/navigation_menu.rs | 1 - 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/core/save.rs b/src/core/save.rs index ed04e30..e76da6b 100644 --- a/src/core/save.rs +++ b/src/core/save.rs @@ -69,7 +69,6 @@ pub async fn backup_phone( } pub fn list_available_backups(dir: &Path) -> Vec { - #[allow(clippy::option_if_let_else)] match fs::read_dir(dir) { Ok(files) => files .filter_map(Result::ok) diff --git a/src/core/uad_lists.rs b/src/core/uad_lists.rs index 48bf4b6..0deece6 100644 --- a/src/core/uad_lists.rs +++ b/src/core/uad_lists.rs @@ -16,7 +16,6 @@ pub const LIST_FNAME: &str = "uad_lists.json"; )] // not `const`, because it's too big pub static DATA: &str = include_str!("../../resources/assets/uad_lists.json"); -// TODO: use `const_format` crate #[derive(Deserialize, Debug, Clone, PartialEq, Hash, Eq)] #[serde(rename_all = "camelCase")] diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 964975a..09dffa6 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -107,11 +107,9 @@ impl Application for UadGui { fn title(&self) -> String { String::from("Universal Android Debloater Next Generation") } - // TODO: refactor later #[allow(clippy::too_many_lines)] fn update(&mut self, msg: Message) -> Command { match msg { - #[allow(clippy::option_if_let_else)] Message::LoadDevices(devices_list) => { self.selected_device = match &self.selected_device { Some(s_device) => { @@ -125,7 +123,7 @@ impl Application for UadGui { }; self.devices_list = devices_list; - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effect")] { self.update(Message::SettingsAction(SettingsMessage::LoadDeviceSettings)); } @@ -150,7 +148,7 @@ impl Application for UadGui { } Message::RefreshButtonPressed => { self.apps_view = AppsView::default(); - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effect")] { self.update(Message::AppsAction(AppsMessage::ADBSatisfied( self.adb_satisfied, @@ -186,7 +184,7 @@ impl Application for UadGui { self.nb_running_async_adb_commands -= 1; self.view = View::List; - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effect")] { self.apps_view.update( &mut self.settings_view, @@ -267,7 +265,7 @@ impl Application for UadGui { info!("{:-^65}", "-"); self.apps_view.loading_state = ListLoadingState::FindingPhones; - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effects")] { self.update(Message::SettingsAction(SettingsMessage::LoadDeviceSettings)); self.update(Message::AppsAction(AppsMessage::ToggleAllSelected(false))); @@ -315,7 +313,7 @@ impl Application for UadGui { } } else { error!("Failed to update {NAME}!"); - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effect")] { self.update(Message::AppsAction(AppsMessage::UpdateFailed)); self.update_state.self_update.status = SelfUpdateStatus::Failed; diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index c8f8b0d..f1c406a 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -110,7 +110,6 @@ impl From for SummaryEntry { } impl List { - // TODO: refactor later #[allow(clippy::too_many_lines)] pub fn update( &mut self, @@ -461,7 +460,6 @@ impl List { .into() } - // TODO: refactor later #[allow(clippy::too_many_lines)] fn ready_view( &self, @@ -621,7 +619,6 @@ impl List { } } - // TODO: refactor later #[allow(clippy::too_many_lines)] fn apply_selection_modal( &self, diff --git a/src/gui/views/settings.rs b/src/gui/views/settings.rs index dfcd6f6..80f3e69 100644 --- a/src/gui/views/settings.rs +++ b/src/gui/views/settings.rs @@ -68,7 +68,6 @@ pub enum Message { } impl Settings { - // TODO: refactor later #[allow(clippy::too_many_lines)] pub fn update( &mut self, @@ -225,7 +224,7 @@ impl Settings { if let Ok(path) = result { self.general.backup_folder = path; Config::save_changes(self, &phone.adb_id); - #[allow(unused_must_use)] + #[expect(unused_must_use, reason = "side-effect")] { self.update( phone, @@ -260,7 +259,6 @@ impl Settings { } } - // TODO: refactor later #[allow(clippy::too_many_lines)] pub fn view(&self, phone: &Phone, apps_view: &AppsView) -> Element { let radio_btn_theme = Theme::ALL diff --git a/src/gui/widgets/navigation_menu.rs b/src/gui/widgets/navigation_menu.rs index 8bcf339..dd1a242 100644 --- a/src/gui/widgets/navigation_menu.rs +++ b/src/gui/widgets/navigation_menu.rs @@ -34,7 +34,6 @@ pub fn nav_menu<'a>( let reboot_btn = button_primary("Reboot").on_press(Message::RebootButtonPressed); - #[allow(clippy::option_if_let_else)] let uad_version_text = if let Some(r) = &self_update_state.latest_release { match self_update_state.status { SelfUpdateStatus::Failed => text(format!("Failed to update to {}", r.tag_name)),