From f6bf0048b52ffd1368a3392b67a7589aedeac23f Mon Sep 17 00:00:00 2001 From: Rudxain <76864299+Rudxain@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:48:19 -0400 Subject: [PATCH 1/2] hotfix(adb): use actual `cfg` instead of `debug_assert` fixes regression introduced by this commit: db719e0cb48a42ca270bf755f4ec8c15f1affe65 --- src/core/adb.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/adb.rs b/src/core/adb.rs index bb9395d..c28a56e 100644 --- a/src/core/adb.rs +++ b/src/core/adb.rs @@ -150,7 +150,10 @@ impl ACommand { // typically 5 allocs. // ideally 0, if we didn't use `lines`. .map(|(i, ln)| { - debug_assert!(match i { + // DO NOT "REFACTOR" TO `debug_assert`! + // it's not the same! + #[cfg(debug_assertions)] + assert!(match i { 0 => TRIPLE.is_match(ln), 1 => DISTRO.is_match(ln), 2 => From 7506112daf30346f2849ff759d2175c3e03e2be3 Mon Sep 17 00:00:00 2001 From: Rudxain <76864299+Rudxain@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:21:06 -0400 Subject: [PATCH 2/2] fix: refactor and sync self-update `cfg`s regressed by: 3cc2f1d0043708a333631ec52deedccc35b24ad2 --- src/gui/views/about.rs | 66 +++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/src/gui/views/about.rs b/src/gui/views/about.rs index 0666729..8867d96 100644 --- a/src/gui/views/about.rs +++ b/src/gui/views/about.rs @@ -46,33 +46,40 @@ impl About { let uad_lists_btn = button_primary("Update").on_press(Message::UpdateUadLists); #[cfg(feature = "self-update")] - let self_update_btn = button_primary("Update").on_press(Message::DoSelfUpdate); + let self_update_row = { + let self_update_btn = button_primary("Update").on_press(Message::DoSelfUpdate); - #[cfg(feature = "self-update")] - let uad_version_text = - text(format!("{NAME} version: v{}", env!("CARGO_PKG_VERSION"))).width(250); + let uad_version_text = + text(format!("{NAME} version: v{}", env!("CARGO_PKG_VERSION"))).width(250); - #[cfg(feature = "self-update")] - #[rustfmt::skip] - let self_update_text = update_state.self_update.latest_release.as_ref().map_or_else(|| - if update_state.self_update.status == SelfUpdateStatus::Done { - "(No update available)".to_string() - } else { - update_state.self_update.status.to_string() - }, |r| if update_state.self_update.status == SelfUpdateStatus::Updating { - update_state.self_update.status.to_string() - } else { - format!("({} available)", r.tag_name) - }); + let self_update_text = update_state + .self_update + .latest_release + .as_ref() + .map_or_else( + || { + if update_state.self_update.status == SelfUpdateStatus::Done { + "(No update available)".to_string() + } else { + update_state.self_update.status.to_string() + } + }, + |r| { + if update_state.self_update.status == SelfUpdateStatus::Updating { + update_state.self_update.status.to_string() + } else { + format!("({} available)", r.tag_name) + } + }, + ); - #[cfg(feature = "self-update")] - let last_self_update_text = text(self_update_text).style(style::Text::Default); + let last_self_update_text = text(self_update_text).style(style::Text::Default); - #[cfg(feature = "self-update")] - let self_update_row = row![uad_version_text, self_update_btn, last_self_update_text,] - .align_items(Alignment::Center) - .spacing(10) - .width(550); + row![uad_version_text, self_update_btn, last_self_update_text,] + .align_items(Alignment::Center) + .spacing(10) + .width(550) + }; let uad_list_row = row![uad_list_text, uad_lists_btn, last_update_text,] .align_items(Alignment::Center) @@ -105,13 +112,12 @@ impl About { .align_items(Alignment::Center) .width(550); - let update_column = if cfg!(feature = "self-update") { - column![uad_list_row, self_update_row, adb_version_row] - } else { - column![uad_list_row, adb_version_row] - } - .align_items(Alignment::Center) - .spacing(10); + #[cfg(feature = "self-update")] + let update_column = column![uad_list_row, self_update_row, adb_version_row]; + #[cfg(not(feature = "self-update"))] + let update_column = column![uad_list_row, adb_version_row]; + + let update_column = update_column.align_items(Alignment::Center).spacing(10); let update_container = container(update_column) .width(Length::Fill)