diff --git a/userspace/ksud_magic/src/apk_sign.rs b/userspace/ksud_magic/src/apk_sign.rs index 4b2c4a98..6d047cca 100644 --- a/userspace/ksud_magic/src/apk_sign.rs +++ b/userspace/ksud_magic/src/apk_sign.rs @@ -1,4 +1,4 @@ -use anyhow::{Result, ensure}; +use anyhow::{ensure, Result}; use std::io::{Read, Seek, SeekFrom}; pub fn get_apk_signature(apk: &str) -> Result<(u32, String)> { diff --git a/userspace/ksud_magic/src/boot_patch.rs b/userspace/ksud_magic/src/boot_patch.rs index 68022741..471daa68 100644 --- a/userspace/ksud_magic/src/boot_patch.rs +++ b/userspace/ksud_magic/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::{File, copy}; + use std::fs::{copy, File}; use std::io::{BufReader, Read}; let kernel_path = workdir.join("kernel"); copy(kernel, &kernel_path).context("Failed to copy kernel")?; @@ -200,11 +200,7 @@ fn is_magisk_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result { .current_dir(workdir) .stdout(Stdio::null()) .stderr(Stdio::null()) - .args([ - "cpio", - vendor_ramdisk_cpio.to_str().unwrap(), - "test", - ]) + .args(["cpio", vendor_ramdisk_cpio.to_str().unwrap(), "test"]) .status()?; // 0: stock, 1: magisk diff --git a/userspace/ksud_magic/src/debug.rs b/userspace/ksud_magic/src/debug.rs index cd367587..8ff851d3 100644 --- a/userspace/ksud_magic/src/debug.rs +++ b/userspace/ksud_magic/src/debug.rs @@ -1,4 +1,4 @@ -use anyhow::{Context, Ok, Result, ensure}; +use anyhow::{ensure, Context, Ok, Result}; use std::{ path::{Path, PathBuf}, process::Command, diff --git a/userspace/ksud_magic/src/init_event.rs b/userspace/ksud_magic/src/init_event.rs index 0f19222c..36d14522 100644 --- a/userspace/ksud_magic/src/init_event.rs +++ b/userspace/ksud_magic/src/init_event.rs @@ -3,7 +3,7 @@ use crate::module::{handle_updated_modules, prune_modules}; use crate::{assets, defs, ksucalls, restorecon, utils}; use anyhow::{Context, Result}; use log::{info, warn}; -use rustix::fs::{MountFlags, mount}; +use rustix::fs::{mount, MountFlags}; use std::path::Path; pub fn on_post_data_fs() -> Result<()> { diff --git a/userspace/ksud_magic/src/magic_mount.rs b/userspace/ksud_magic/src/magic_mount.rs index 48c76819..61727e48 100644 --- a/userspace/ksud_magic/src/magic_mount.rs +++ b/userspace/ksud_magic/src/magic_mount.rs @@ -4,20 +4,20 @@ use crate::defs::{ use crate::magic_mount::NodeFileType::{Directory, RegularFile, Symlink, Whiteout}; use crate::restorecon::{lgetfilecon, lsetfilecon}; use crate::utils::ensure_dir_exists; -use anyhow::{Context, Result, bail}; +use anyhow::{bail, Context, Result}; use extattr::lgetxattr; use rustix::fs::{ - Gid, MetadataExt, Mode, MountFlags, MountPropagationFlags, Uid, UnmountFlags, bind_mount, - chmod, chown, mount, move_mount, unmount, + bind_mount, chmod, chown, mount, move_mount, unmount, Gid, MetadataExt, Mode, MountFlags, + MountPropagationFlags, Uid, UnmountFlags, }; use rustix::mount::mount_change; use rustix::path::Arg; use std::cmp::PartialEq; -use std::collections::HashMap; use std::collections::hash_map::Entry; +use std::collections::HashMap; use std::fs; -use std::fs::{DirEntry, FileType, create_dir, create_dir_all, read_dir, read_link}; -use std::os::unix::fs::{FileTypeExt, symlink}; +use std::fs::{create_dir, create_dir_all, read_dir, read_link, DirEntry, FileType}; +use std::os::unix::fs::{symlink, FileTypeExt}; use std::path::{Path, PathBuf}; const REPLACE_DIR_XATTR: &str = "trusted.overlay.opaque"; diff --git a/userspace/ksud_magic/src/module.rs b/userspace/ksud_magic/src/module.rs index f95e10b5..1c1d4e9a 100644 --- a/userspace/ksud_magic/src/module.rs +++ b/userspace/ksud_magic/src/module.rs @@ -6,7 +6,7 @@ use crate::{ sepolicy, }; -use anyhow::{Context, Result, anyhow, bail, ensure}; +use anyhow::{anyhow, bail, ensure, Context, Result}; use const_format::concatcp; use is_executable::is_executable; use java_properties::PropertiesIter; @@ -16,7 +16,7 @@ use std::fs::{copy, rename}; use std::{ collections::HashMap, env::var as env_var, - fs::{File, Permissions, remove_dir_all, remove_file, set_permissions}, + fs::{remove_dir_all, remove_file, set_permissions, File, Permissions}, io::Cursor, path::{Path, PathBuf}, process::Command, diff --git a/userspace/ksud_magic/src/restorecon.rs b/userspace/ksud_magic/src/restorecon.rs index 91ccfb11..c396481d 100644 --- a/userspace/ksud_magic/src/restorecon.rs +++ b/userspace/ksud_magic/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::{Flags as XattrFlags, lsetxattr}; +use extattr::{lsetxattr, Flags as XattrFlags}; 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_magic/src/sepolicy.rs b/userspace/ksud_magic/src/sepolicy.rs index 90350cad..62dedd42 100644 --- a/userspace/ksud_magic/src/sepolicy.rs +++ b/userspace/ksud_magic/src/sepolicy.rs @@ -1,11 +1,11 @@ -use anyhow::{Result, bail}; +use anyhow::{bail, Result}; use derive_new::new; use nom::{ - AsChar, IResult, Parser, branch::alt, - bytes::complete::{tag, take_while, take_while_m_n, take_while1}, + bytes::complete::{tag, take_while, take_while1, take_while_m_n}, character::complete::{space0, space1}, combinator::map, + AsChar, IResult, Parser, }; use std::{ffi, path::Path, vec}; diff --git a/userspace/ksud_magic/src/su.rs b/userspace/ksud_magic/src/su.rs index f5d9e764..833609b5 100644 --- a/userspace/ksud_magic/src/su.rs +++ b/userspace/ksud_magic/src/su.rs @@ -14,7 +14,7 @@ use crate::{ #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process::getuid, - thread::{Gid, Uid, set_thread_res_gid, set_thread_res_uid}, + thread::{set_thread_res_gid, set_thread_res_uid, Gid, Uid}, }; #[cfg(any(target_os = "linux", target_os = "android"))] diff --git a/userspace/ksud_magic/src/utils.rs b/userspace/ksud_magic/src/utils.rs index cbca216a..5e521ee2 100644 --- a/userspace/ksud_magic/src/utils.rs +++ b/userspace/ksud_magic/src/utils.rs @@ -1,6 +1,6 @@ -use anyhow::{Context, Error, Ok, Result, bail}; +use anyhow::{bail, Context, Error, Ok, Result}; use std::{ - fs::{File, OpenOptions, create_dir_all, remove_file, write}, + fs::{create_dir_all, remove_file, write, File, OpenOptions}, 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::{Permissions, set_permissions}; +use std::fs::{set_permissions, Permissions}; #[cfg(unix)] use std::os::unix::prelude::PermissionsExt; @@ -20,7 +20,7 @@ use std::path::PathBuf; #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process, - thread::{LinkNameSpaceType, move_into_link_name_space}, + thread::{move_into_link_name_space, LinkNameSpaceType}, }; pub fn ensure_clean_dir(dir: impl AsRef) -> Result<()> { @@ -125,7 +125,7 @@ pub fn get_zip_uncompressed_size(zip_path: &str) -> Result { pub fn switch_mnt_ns(pid: i32) -> Result<()> { use rustix::{ fd::AsFd, - fs::{Mode, OFlags, open}, + fs::{open, Mode, OFlags}, }; let path = format!("/proc/{pid}/ns/mnt"); let fd = open(path, OFlags::RDONLY, Mode::from_raw_mode(0))?; diff --git a/userspace/ksud_overlayfs/src/apk_sign.rs b/userspace/ksud_overlayfs/src/apk_sign.rs index 4b2c4a98..6d047cca 100644 --- a/userspace/ksud_overlayfs/src/apk_sign.rs +++ b/userspace/ksud_overlayfs/src/apk_sign.rs @@ -1,4 +1,4 @@ -use anyhow::{Result, ensure}; +use anyhow::{ensure, Result}; use std::io::{Read, Seek, SeekFrom}; pub fn get_apk_signature(apk: &str) -> Result<(u32, String)> { diff --git a/userspace/ksud_overlayfs/src/boot_patch.rs b/userspace/ksud_overlayfs/src/boot_patch.rs index 68022741..471daa68 100644 --- a/userspace/ksud_overlayfs/src/boot_patch.rs +++ b/userspace/ksud_overlayfs/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::{File, copy}; + use std::fs::{copy, File}; use std::io::{BufReader, Read}; let kernel_path = workdir.join("kernel"); copy(kernel, &kernel_path).context("Failed to copy kernel")?; @@ -200,11 +200,7 @@ fn is_magisk_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result { .current_dir(workdir) .stdout(Stdio::null()) .stderr(Stdio::null()) - .args([ - "cpio", - vendor_ramdisk_cpio.to_str().unwrap(), - "test", - ]) + .args(["cpio", vendor_ramdisk_cpio.to_str().unwrap(), "test"]) .status()?; // 0: stock, 1: magisk diff --git a/userspace/ksud_overlayfs/src/debug.rs b/userspace/ksud_overlayfs/src/debug.rs index cd367587..8ff851d3 100644 --- a/userspace/ksud_overlayfs/src/debug.rs +++ b/userspace/ksud_overlayfs/src/debug.rs @@ -1,4 +1,4 @@ -use anyhow::{Context, Ok, Result, ensure}; +use anyhow::{ensure, Context, Ok, Result}; use std::{ path::{Path, PathBuf}, process::Command, diff --git a/userspace/ksud_overlayfs/src/init_event.rs b/userspace/ksud_overlayfs/src/init_event.rs index 46311be1..7107ff74 100644 --- a/userspace/ksud_overlayfs/src/init_event.rs +++ b/userspace/ksud_overlayfs/src/init_event.rs @@ -1,4 +1,4 @@ -use anyhow::{Context, Result, bail}; +use anyhow::{bail, Context, Result}; use log::{info, warn}; use std::{collections::HashMap, path::Path}; diff --git a/userspace/ksud_overlayfs/src/module.rs b/userspace/ksud_overlayfs/src/module.rs index e08793ba..f9dbb322 100644 --- a/userspace/ksud_overlayfs/src/module.rs +++ b/userspace/ksud_overlayfs/src/module.rs @@ -6,7 +6,7 @@ use crate::{ sepolicy, utils, }; -use anyhow::{Context, Result, anyhow, bail, ensure}; +use anyhow::{anyhow, bail, ensure, Context, Result}; use const_format::concatcp; use is_executable::is_executable; use java_properties::PropertiesIter; @@ -18,7 +18,7 @@ use std::io; use std::{ collections::HashMap, env::var as env_var, - fs::{File, Permissions, remove_dir_all, remove_file, set_permissions}, + fs::{remove_dir_all, remove_file, set_permissions, File, Permissions}, io::Cursor, path::{Path, PathBuf}, process::{Command, Stdio}, diff --git a/userspace/ksud_overlayfs/src/mount.rs b/userspace/ksud_overlayfs/src/mount.rs index bdc486e7..11be898b 100644 --- a/userspace/ksud_overlayfs/src/mount.rs +++ b/userspace/ksud_overlayfs/src/mount.rs @@ -1,4 +1,4 @@ -use anyhow::{Ok, Result, anyhow, bail}; +use anyhow::{anyhow, bail, Ok, Result}; #[cfg(any(target_os = "linux", target_os = "android"))] use anyhow::Context; diff --git a/userspace/ksud_overlayfs/src/restorecon.rs b/userspace/ksud_overlayfs/src/restorecon.rs index 7656357e..152a7c5e 100644 --- a/userspace/ksud_overlayfs/src/restorecon.rs +++ b/userspace/ksud_overlayfs/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::{Flags as XattrFlags, lsetxattr}; +use extattr::{lsetxattr, Flags as XattrFlags}; 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_overlayfs/src/sepolicy.rs b/userspace/ksud_overlayfs/src/sepolicy.rs index 90350cad..62dedd42 100644 --- a/userspace/ksud_overlayfs/src/sepolicy.rs +++ b/userspace/ksud_overlayfs/src/sepolicy.rs @@ -1,11 +1,11 @@ -use anyhow::{Result, bail}; +use anyhow::{bail, Result}; use derive_new::new; use nom::{ - AsChar, IResult, Parser, branch::alt, - bytes::complete::{tag, take_while, take_while_m_n, take_while1}, + bytes::complete::{tag, take_while, take_while1, take_while_m_n}, character::complete::{space0, space1}, combinator::map, + AsChar, IResult, Parser, }; use std::{ffi, path::Path, vec}; diff --git a/userspace/ksud_overlayfs/src/su.rs b/userspace/ksud_overlayfs/src/su.rs index 5f3abdd7..50d8a0fa 100644 --- a/userspace/ksud_overlayfs/src/su.rs +++ b/userspace/ksud_overlayfs/src/su.rs @@ -14,7 +14,7 @@ use crate::{ #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process::getuid, - thread::{Gid, Uid, set_thread_res_gid, set_thread_res_uid}, + thread::{set_thread_res_gid, set_thread_res_uid, Gid, Uid}, }; #[cfg(any(target_os = "linux", target_os = "android"))] diff --git a/userspace/ksud_overlayfs/src/utils.rs b/userspace/ksud_overlayfs/src/utils.rs index ecb370b6..25485fa6 100644 --- a/userspace/ksud_overlayfs/src/utils.rs +++ b/userspace/ksud_overlayfs/src/utils.rs @@ -1,6 +1,6 @@ -use anyhow::{Context, Error, Ok, Result, bail}; +use anyhow::{bail, Context, Error, Ok, Result}; use std::{ - fs::{self, File, OpenOptions, create_dir_all, remove_file, write}, + fs::{self, create_dir_all, remove_file, write, File, OpenOptions}, io::{ ErrorKind::{AlreadyExists, NotFound}, Write, @@ -13,7 +13,7 @@ use std::{ use crate::{assets, boot_patch, defs, ksucalls, module, restorecon}; use std::fs::metadata; #[allow(unused_imports)] -use std::fs::{Permissions, set_permissions}; +use std::fs::{set_permissions, Permissions}; #[cfg(unix)] use std::os::unix::prelude::PermissionsExt; @@ -26,7 +26,7 @@ use std::path::PathBuf; #[cfg(any(target_os = "linux", target_os = "android"))] use rustix::{ process, - thread::{LinkNameSpaceType, move_into_link_name_space}, + thread::{move_into_link_name_space, LinkNameSpaceType}, }; pub fn ensure_clean_dir(dir: impl AsRef) -> Result<()> { @@ -131,7 +131,7 @@ pub fn get_zip_uncompressed_size(zip_path: &str) -> Result { pub fn switch_mnt_ns(pid: i32) -> Result<()> { use rustix::{ fd::AsFd, - fs::{Mode, OFlags, open}, + fs::{open, Mode, OFlags}, }; let path = format!("/proc/{pid}/ns/mnt"); let fd = open(path, OFlags::RDONLY, Mode::from_raw_mode(0))?;