ceos/universal-android-debloater-next-generation
1
0
Fork 0
mirror of https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation.git synced 2026-08-23 22:14:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: undo questionable with_capacity usage

Browse source 
Also forgot to revert another `phone`->`device` rename
This commit is contained in:
Rudxain 2025-01-23 20:26:56 -04:00
commit 4f484ae7e5
No known key found for this signature in database
GPG key ID: 0DAC837DDEF8E96C
3 changed files with 7 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/utils.rs
View file

@ -65,9 +65,7 @@ pub fn fetch_packages(
let mut uad_list;
let mut state;
let mut removal;
// This assumes `for` iter-count is **exact**:
// there are no `continue`s, `break`s, or `return`s.
let mut user_package: Vec<PackageRow> = Vec::with_capacity(all_sys_packs.len());
let mut user_package: Vec<PackageRow> = Vec::new();
for pack_name in all_sys_packs {
let p_name = &pack_name;

24
src/gui/views/list.rs
View file

@ -127,12 +127,7 @@ impl List {
Command::none()
}
Message::ModalValidate => {
let mut commands = Vec::with_capacity(
self.selected_packages
.len()
.checked_mul(2)
.unwrap_or_else(|| unreachable!()),
);
let mut commands = vec![];
self.selected_packages.sort_unstable();
self.selected_packages.dedup();
for selection in &self.selected_packages {
@ -326,7 +321,7 @@ impl List {
)
}
Message::ClearSelectedPackages => {
self.selected_packages = vec![];
self.selected_packages = Vec::new();
Command::none()
}
Message::ADBSatisfied(result) => {
@ -874,11 +869,11 @@ impl List {
}
#[expect(clippy::unused_async, reason = "1 call-site")]
async fn init_apps_view(remote: bool, device: Phone) -> (PackageHashMap, UadListState) {
async fn init_apps_view(remote: bool, phone: Phone) -> (PackageHashMap, UadListState) {
let uad_lists = load_debloat_lists(remote);
match uad_lists {
Ok(list) => {
if device.adb_id.is_empty() {
if phone.adb_id.is_empty() {
error!("AppsView ready but no phone found");
}
(list, UadListState::Done)
@ -957,16 +952,7 @@ fn build_action_pkg_commands(
let pkg = &packages[selection.0][selection.1];
let wanted_state = pkg.state.opposite(settings.disable_mode);
// performance, and fail-fast in case of OOM
let mut commands = Vec::with_capacity(
device
.user_list
.len()
// ~2 actions per user
.checked_mul(2)
.unwrap_or_else(|| unreachable!()),
);
let mut commands = vec![];
for u in device.user_list.iter().filter(|&&u| {
!u.protected && (packages[u.index][selection.1].selected || settings.multi_user_mode)
}) {

8
src/gui/views/settings.rs
View file

@ -174,13 +174,7 @@ impl Settings {
}
Message::RestoreDevice => match restore_backup(phone, packages, &self.device) {
Ok(r_packages) => {
let mut commands = Vec::with_capacity(
r_packages
.len()
// assume ~2 cmds per pack
.checked_mul(2)
.unwrap_or_else(|| unreachable!()),
);
let mut commands = vec![];
*nb_running_async_adb_commands = 0;
for p in &r_packages {
let p_info = PackageInfo {