From 4fdd3e07e51831ea2599d39b22e19e2f55282cdd Mon Sep 17 00:00:00 2001 From: weishu Date: Mon, 24 Feb 2025 16:53:37 +0800 Subject: [PATCH] ksud: migrate to Rust 2024 edition --- userspace/ksud/Cargo.toml | 2 +- userspace/ksud/src/apk_sign.rs | 2 +- userspace/ksud/src/boot_patch.rs | 6 +++--- userspace/ksud/src/debug.rs | 2 +- userspace/ksud/src/init_event.rs | 2 +- userspace/ksud/src/module.rs | 19 +++++++++++-------- userspace/ksud/src/mount.rs | 2 +- userspace/ksud/src/restorecon.rs | 2 +- userspace/ksud/src/sepolicy.rs | 6 +++--- userspace/ksud/src/su.rs | 4 ++-- userspace/ksud/src/utils.rs | 10 +++++----- 11 files changed, 30 insertions(+), 27 deletions(-) diff --git a/userspace/ksud/Cargo.toml b/userspace/ksud/Cargo.toml index 0d4e3853..9fefb6bb 100644 --- a/userspace/ksud/Cargo.toml +++ b/userspace/ksud/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ksud" 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/userspace/ksud/src/apk_sign.rs b/userspace/ksud/src/apk_sign.rs index 6d047cca..4b2c4a98 100644 --- a/userspace/ksud/src/apk_sign.rs +++ b/userspace/ksud/src/apk_sign.rs @@ -1,4 +1,4 @@ -use anyhow::{ensure, Result}; +use anyhow::{Result, ensure}; use std::io::{Read, Seek, SeekFrom}; pub fn get_apk_signature(apk: &str) -> Result<(u32, String)> { diff --git a/userspace/ksud/src/boot_patch.rs b/userspace/ksud/src/boot_patch.rs index a31a26dd..b0f2caed 100644 --- a/userspace/ksud/src/boot_patch.rs +++ b/userspace/ksud/src/boot_patch.rs @@ -5,11 +5,11 @@ use std::path::PathBuf; use std::process::Command; use std::process::Stdio; +use anyhow::Context; +use anyhow::Result; use anyhow::anyhow; use anyhow::bail; use anyhow::ensure; -use anyhow::Context; -use anyhow::Result; use regex_lite::Regex; use which::which; @@ -97,7 +97,7 @@ pub fn get_current_kmi() -> Result { } fn parse_kmi_from_kernel(kernel: &PathBuf, workdir: &Path) -> Result { - use std::fs::{copy, File}; + use std::fs::{File, copy}; use std::io::{BufReader, Read}; let kernel_path = workdir.join("kernel"); copy(kernel, &kernel_path).context("Failed to copy kernel")?; diff --git a/userspace/ksud/src/debug.rs b/userspace/ksud/src/debug.rs index 8ff851d3..cd367587 100644 --- a/userspace/ksud/src/debug.rs +++ b/userspace/ksud/src/debug.rs @@ -1,4 +1,4 @@ -use anyhow::{ensure, Context, Ok, Result}; +use anyhow::{Context, Ok, Result, ensure}; use std::{ path::{Path, PathBuf}, process::Command, diff --git a/userspace/ksud/src/init_event.rs b/userspace/ksud/src/init_event.rs index 5839c195..bbe5a837 100644 --- a/userspace/ksud/src/init_event.rs +++ b/userspace/ksud/src/init_event.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use log::{info, warn}; use std::{collections::HashMap, path::Path}; diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs index fb7604eb..7716cb5d 100644 --- a/userspace/ksud/src/module.rs +++ b/userspace/ksud/src/module.rs @@ -6,7 +6,7 @@ use crate::{ sepolicy, utils, }; -use anyhow::{anyhow, bail, ensure, Context, Result}; +use anyhow::{Context, Result, anyhow, bail, ensure}; use const_format::concatcp; use is_executable::is_executable; use java_properties::PropertiesIter; @@ -16,7 +16,7 @@ use std::fs::OpenOptions; use std::{ collections::HashMap, env::var as env_var, - fs::{remove_dir_all, remove_file, set_permissions, File, Permissions}, + fs::{File, Permissions, remove_dir_all, remove_file, set_permissions}, io::Cursor, path::{Path, PathBuf}, process::{Command, Stdio}, @@ -672,12 +672,15 @@ fn _list_modules(path: &str) -> Vec> { }); if !module_prop_map.contains_key("id") || module_prop_map["id"].is_empty() { - if let Some(id) = entry.file_name().to_str() { - info!("Use dir name as module id: {}", id); - module_prop_map.insert("id".to_owned(), id.to_owned()); - } else { - info!("Failed to get module id: {:?}", module_prop); - continue; + match entry.file_name().to_str() { + Some(id) => { + info!("Use dir name as module id: {}", id); + module_prop_map.insert("id".to_owned(), id.to_owned()); + } + _ => { + info!("Failed to get module id: {:?}", module_prop); + continue; + } } } diff --git a/userspace/ksud/src/mount.rs b/userspace/ksud/src/mount.rs index a15deb97..c9982d9f 100644 --- a/userspace/ksud/src/mount.rs +++ b/userspace/ksud/src/mount.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, bail, Ok, Result}; +use anyhow::{Ok, Result, anyhow, bail}; #[cfg(any(target_os = "linux", target_os = "android"))] use anyhow::Context; diff --git a/userspace/ksud/src/restorecon.rs b/userspace/ksud/src/restorecon.rs index 152a7c5e..7656357e 100644 --- a/userspace/ksud/src/restorecon.rs +++ b/userspace/ksud/src/restorecon.rs @@ -6,7 +6,7 @@ use std::path::Path; #[cfg(any(target_os = "linux", target_os = "android"))] use anyhow::{Context, Ok}; #[cfg(any(target_os = "linux", target_os = "android"))] -use extattr::{lsetxattr, Flags as XattrFlags}; +use extattr::{Flags as XattrFlags, lsetxattr}; pub const SYSTEM_CON: &str = "u:object_r:system_file:s0"; pub const ADB_CON: &str = "u:object_r:adb_data_file:s0"; diff --git a/userspace/ksud/src/sepolicy.rs b/userspace/ksud/src/sepolicy.rs index 62dedd42..90350cad 100644 --- a/userspace/ksud/src/sepolicy.rs +++ b/userspace/ksud/src/sepolicy.rs @@ -1,11 +1,11 @@ -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use derive_new::new; use nom::{ + AsChar, IResult, Parser, branch::alt, - bytes::complete::{tag, take_while, take_while1, take_while_m_n}, + bytes::complete::{tag, take_while, take_while_m_n, take_while1}, character::complete::{space0, space1}, combinator::map, - AsChar, IResult, Parser, }; use std::{ffi, path::Path, vec}; diff --git a/userspace/ksud/src/su.rs b/userspace/ksud/src/su.rs index fde12c96..8d79c6ca 100644 --- a/userspace/ksud/src/su.rs +++ b/userspace/ksud/src/su.rs @@ -14,7 +14,7 @@ use crate::{ #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process::getuid, - thread::{set_thread_res_gid, set_thread_res_uid, Gid, Uid}, + thread::{Gid, Uid, set_thread_res_gid, set_thread_res_uid}, }; #[cfg(any(target_os = "linux", target_os = "android"))] @@ -280,6 +280,6 @@ fn add_path_to_env(path: &str) -> Result<()> { let new_path = PathBuf::from(path.trim_end_matches('/')); paths.push(new_path); let new_path_env = env::join_paths(paths)?; - env::set_var("PATH", new_path_env); + unsafe { env::set_var("PATH", new_path_env) }; Ok(()) } diff --git a/userspace/ksud/src/utils.rs b/userspace/ksud/src/utils.rs index 71ebc443..6cdba85e 100644 --- a/userspace/ksud/src/utils.rs +++ b/userspace/ksud/src/utils.rs @@ -1,6 +1,6 @@ -use anyhow::{bail, Context, Error, Ok, Result}; +use anyhow::{Context, Error, Ok, Result, bail}; use std::{ - fs::{create_dir_all, remove_file, write, File, OpenOptions}, + fs::{File, OpenOptions, create_dir_all, remove_file, write}, io::{ ErrorKind::{AlreadyExists, NotFound}, Write, @@ -11,7 +11,7 @@ use std::{ use crate::{assets, boot_patch, defs, ksucalls, module, restorecon}; #[allow(unused_imports)] -use std::fs::{set_permissions, Permissions}; +use std::fs::{Permissions, set_permissions}; #[cfg(unix)] use std::os::unix::prelude::PermissionsExt; @@ -24,7 +24,7 @@ use std::path::PathBuf; #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process, - thread::{move_into_link_name_space, LinkNameSpaceType}, + thread::{LinkNameSpaceType, move_into_link_name_space}, }; pub fn ensure_clean_dir(dir: impl AsRef) -> Result<()> { @@ -129,7 +129,7 @@ pub fn get_zip_uncompressed_size(zip_path: &str) -> Result { pub fn switch_mnt_ns(pid: i32) -> Result<()> { use rustix::{ fd::AsFd, - fs::{open, Mode, OFlags}, + fs::{Mode, OFlags, open}, }; let path = format!("/proc/{pid}/ns/mnt"); let fd = open(path, OFlags::RDONLY, Mode::from_raw_mode(0))?;