From d383da804df13da6caab600ca20bcc928fde1846 Mon Sep 17 00:00:00 2001 From: Rudxain <76864299+Rudxain@users.noreply.github.com> Date: Sat, 9 Aug 2025 20:21:56 -0400 Subject: [PATCH] ci: `cargo clippy --fix; cargo fmt` --- src/core/sync.rs | 2 +- src/gui/mod.rs | 2 +- src/gui/views/about.rs | 2 +- src/gui/views/list.rs | 10 +++++----- src/gui/views/settings.rs | 6 +++++- src/gui/widgets/package_row.rs | 6 +++++- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/core/sync.rs b/src/core/sync.rs index b598836..1235ef7 100644 --- a/src/core/sync.rs +++ b/src/core/sync.rs @@ -333,7 +333,7 @@ pub async fn get_devices_list() -> Vec { model: format!("{} {}", get_device_brand(serial), get_device_model(serial)), android_sdk: get_android_sdk(serial), user_list: list_users_idx_prot(serial), - adb_id: serial.to_string(), + adb_id: serial.clone(), }); } OperationResult::Ok(device_list) diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 72597a9..44f59b2 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -347,7 +347,7 @@ impl Application for UadGui { } } - fn view(&self) -> Element { + fn view(&self) -> Element<'_, Self::Message, Self::Theme, Renderer> { let navigation_container = nav_menu( &self.devices_list, self.selected_device.clone(), diff --git a/src/gui/views/about.rs b/src/gui/views/about.rs index 8413e69..f9b11a9 100644 --- a/src/gui/views/about.rs +++ b/src/gui/views/about.rs @@ -29,7 +29,7 @@ impl About { } // other events are handled by UadGui update() } - pub fn view(&self, update_state: &UpdateState) -> Element { + pub fn view(&self, update_state: &UpdateState) -> Element<'_, Message, Theme, Renderer> { let about_text = text(format!( "Universal Android Debloater Next Generation ({NAME}) is a free and open-source community project \naiming at simplifying the removal of pre-installed apps on any Android device." )); diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index d48002c..0add30d 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -376,7 +376,7 @@ impl List { self.copy_confirmation = true; Command::batch(vec![ iced::clipboard::write::(err), - Command::perform(Self::delay_hide_copy_confirmation(), |_| { + Command::perform(Self::delay_hide_copy_confirmation(), |()| { Message::HideCopyConfirmation }), ]) @@ -393,7 +393,7 @@ impl List { &self, settings: &Settings, selected_device: &Phone, - ) -> Element { + ) -> Element<'_, Message, Theme, Renderer> { match &self.loading_state { LoadingState::DownloadingList => waiting_view( &format!("Downloading latest {NAME} lists from GitHub. Please wait..."), @@ -438,7 +438,7 @@ impl List { } } - fn control_panel(&self, selected_device: &Phone) -> Element { + fn control_panel(&self, selected_device: &Phone) -> Element<'_, Message, Theme, Renderer> { let search_packages = text_input("Search packages...", &self.input_value) .width(Length::Fill) .on_input(Message::SearchInputChanged) @@ -504,7 +504,7 @@ impl List { &self, settings: &Settings, selected_device: &Phone, - ) -> Element { + ) -> Element<'_, Message, Theme, Renderer> { let packages = self .filtered_packages .iter() @@ -665,7 +665,7 @@ impl List { device: &Phone, settings: &Settings, packages: &[PackageRow], - ) -> Element { + ) -> Element<'_, Message, Theme, Renderer> { const PACK_NO_USER_MSG: &str = "`selected_packages` implies a user must be selected"; // 5 element slice is cheap diff --git a/src/gui/views/settings.rs b/src/gui/views/settings.rs index 5cd3418..22e1d3c 100644 --- a/src/gui/views/settings.rs +++ b/src/gui/views/settings.rs @@ -252,7 +252,11 @@ impl Settings { } #[allow(clippy::too_many_lines)] - pub fn view(&self, phone: &Phone, apps_view: &AppsView) -> Element { + pub fn view( + &self, + phone: &Phone, + apps_view: &AppsView, + ) -> Element<'_, Message, Theme, Renderer> { let radio_btn_theme = Theme::ALL .iter() .fold(row![].spacing(10), |column, option| { diff --git a/src/gui/widgets/package_row.rs b/src/gui/widgets/package_row.rs index 59c7e39..539531d 100644 --- a/src/gui/widgets/package_row.rs +++ b/src/gui/widgets/package_row.rs @@ -51,7 +51,11 @@ impl PackageRow { Command::none() } - pub fn view(&self, settings: &Settings, _phone: &Phone) -> Element { + pub fn view( + &self, + settings: &Settings, + _phone: &Phone, + ) -> Element<'_, Message, Theme, Renderer> { //let trash_svg = format!("{}/resources/assets/trash.svg", env!("CARGO_MANIFEST_DIR")); //let restore_svg = format!("{}/resources/assets/rotate.svg", env!("CARGO_MANIFEST_DIR")); let button_style;