diff --git a/patcher/Cargo.toml b/patcher/Cargo.toml index f8b8afb..246454e 100644 --- a/patcher/Cargo.toml +++ b/patcher/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "patcher" version = "0.1.0" -edition = "2021" +edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/patcher/src/code_loading_patcher.rs b/patcher/src/code_loading_patcher.rs index dcc96f9..608b8f9 100644 --- a/patcher/src/code_loading_patcher.rs +++ b/patcher/src/code_loading_patcher.rs @@ -115,17 +115,17 @@ fn insert_code_model_class_loaders(apk: &mut Apk, data: &RuntimeData) -> Result< // TODO: update Runtime Data to reflect the name change - let apk = if let ApkOrRef::Ref(apk) = class_loaders.remove(&main_cl_id).unwrap().apk { + let apk = match class_loaders.remove(&main_cl_id).unwrap().apk { ApkOrRef::Ref(apk) => { apk - } else { + } _ => { panic!("Main APK is not stored as ref?") - }; + }}; for (_, ClassLoader { apk: other, .. }) in class_loaders.into_iter() { - if let ApkOrRef::Owned(other) = other { + match other { ApkOrRef::Owned(other) => { apk.merge(other); - } else { + } _ => { panic!("Secondary APK is not stored as owned?") - } + }} } //todo!() Ok(()) @@ -144,14 +144,14 @@ struct ClassLoader<'a> { impl ClassLoader<'_> { pub fn apk_mut(&mut self) -> &mut Apk { match &mut self.apk { - ApkOrRef::Owned(ref mut apk) => apk, - ApkOrRef::Ref(ref mut apk) => apk, + ApkOrRef::Owned(apk) => apk, + ApkOrRef::Ref(apk) => apk, } } pub fn apk(&self) -> &Apk { match &self.apk { - ApkOrRef::Owned(ref apk) => apk, - ApkOrRef::Ref(ref apk) => apk, + ApkOrRef::Owned(apk) => apk, + ApkOrRef::Ref(apk) => apk, } }