bump rust edition for apk_frauder

apk_frauder/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "apk_frauder"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

apk_frauder/src/file_header.rs

@@ -4,7 +4,7 @@ use std::io::{SeekFrom, Write};
 use crate::compression::CompressionMethod;
 use crate::error::Error;
 use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField};
-use crate::{cp437, external_file_attributes, general_purpose_flags, Encoding, Signature};
+use crate::{Encoding, Signature, cp437, external_file_attributes, general_purpose_flags};
 use androscalpel_serializer::{ReadSeek, Result, Serializable};
 
 #[derive(Debug, Clone, PartialEq, Eq)]

apk_frauder/src/lib.rs

@@ -164,15 +164,13 @@ pub fn replace_dex(
     keypassword: Option<&str>,
     additionnal_files: Option<HashMap<String, Option<impl Read + Seek>>>,
 ) -> Result<()> {
-    let zipalign = if let Some(path) = &zipalign {
-        path.as_ref().as_os_str()
-    } else {
-        "zipalign".as_ref()
+    let zipalign = match &zipalign {
+        Some(path) => path.as_ref().as_os_str(),
+        _ => "zipalign".as_ref(),
     };
-    let apksigner = if let Some(path) = &apksigner {
-        path.as_ref().as_os_str()
-    } else {
-        "apksigner".as_ref()
+    let apksigner = match &apksigner {
+        Some(path) => path.as_ref().as_os_str(),
+        _ => "apksigner".as_ref(),
     };
     let tmp_dir = env::temp_dir().join(format!("apk_frauder_{:x}", rand::random::<u128>()));
     let unaligned_path = tmp_dir.join("stripped.apk");

apk_frauder/src/local_file_header.rs

@@ -5,7 +5,7 @@ use log::warn;
 use crate::compression::CompressionMethod;
 use crate::error::Error;
 use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField};
-use crate::{cp437, general_purpose_flags, Encoding, Signature};
+use crate::{Encoding, Signature, cp437, general_purpose_flags};
 use androscalpel_serializer::{ReadSeek, Result, Serializable};
 
 #[derive(Debug, Clone, PartialEq, Eq)]

apk_frauder/src/zip_reader.rs

@@ -1,4 +1,5 @@
 use crate::{
+    FileHeader, FileInfo, LocalFileHeader, Signature,
     apk_signing_block::ApkSigningBlock,
     apk_signing_block::Magic,
     compression::CompressionMethod,
@@ -6,10 +7,10 @@ use crate::{
     end_of_central_directory::EndCentralDirectory,
     end_of_central_directory::Zip64EndCentralDirectory,
     end_of_central_directory::Zip64EndCentralDirectoryLocator,
-    general_purpose_flags, FileHeader, FileInfo, LocalFileHeader, Signature,
+    general_purpose_flags,
 };
 use androscalpel_serializer::Serializable;
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use flate2::read::DeflateDecoder;
 use log::{info, warn};
 use std::collections::HashMap;

apk_frauder/src/zip_writer.rs

@@ -6,7 +6,7 @@ use crate::data_descriptor::DataDescriptor;
 use crate::end_of_central_directory::{
     EndCentralDirectory, Zip64EndCentralDirectory, Zip64EndCentralDirectoryLocator,
 };
-use crate::{general_purpose_flags, FileHeader, FileInfo, LocalFileHeader, ZipFileReader};
+use crate::{FileHeader, FileInfo, LocalFileHeader, ZipFileReader, general_purpose_flags};
 use androscalpel_serializer::Serializable;
 use flate2::write::DeflateEncoder;
 use flate2::{Compression, CrcWriter};