ksud: make clippy happy

userspace/ksud/build.rs

@@ -14,7 +14,7 @@ fn get_git_version() -> Result<(u32, String), std::io::Error> {
     let version_code: u32 = version_code
         .trim()
         .parse()
-        .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to parse git count"))?;
+        .map_err(|_| std::io::Error::other("Failed to parse git count"))?;
     let version_code = 10000 + 200 + version_code; // For historical reasons
 
     let version_name = String::from_utf8(
@@ -23,12 +23,7 @@ fn get_git_version() -> Result<(u32, String), std::io::Error> {
             .output()?
             .stdout,
     )
-    .map_err(|_| {
-        std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "Failed to read git describe stdout",
-        )
-    })?;
+    .map_err(|_| std::io::Error::other("Failed to read git describe stdout"))?;
     let version_name = version_name.trim_start_matches('v').to_string();
     Ok((version_code, version_name))
 }

userspace/ksud/src/boot_patch.rs

@@ -245,7 +245,7 @@ pub fn restore(
         do_cpio_cmd(
             &magiskboot,
             workdir,
-            &format!("extract {0} {0}", BACKUP_FILENAME),
+            &format!("extract {BACKUP_FILENAME} {BACKUP_FILENAME}"),
         )?;
         let sha = std::fs::read(workdir.join(BACKUP_FILENAME))?;
         let sha = String::from_utf8(sha)?;
@@ -384,7 +384,7 @@ fn do_patch(
         match get_current_kmi() {
             Ok(value) => value,
             Err(e) => {
-                println!("- {}", e);
+                println!("- {e}");
                 if let Some(image_path) = &image {
                     println!(
                         "- Trying to auto detect KMI version for {}",
@@ -542,7 +542,7 @@ fn calculate_sha1(file_path: impl AsRef<Path>) -> Result<String> {
     }
 
     let result = hasher.finalize();
-    Ok(format!("{:x}", result))
+    Ok(format!("{result:x}"))
 }
 
 #[cfg(target_os = "android")]
@@ -558,7 +558,7 @@ fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
     do_cpio_cmd(
         magiskboot,
         workdir,
-        &format!("add 0755 {0} {0}", BACKUP_FILENAME),
+        &format!("add 0755 {BACKUP_FILENAME} {BACKUP_FILENAME}"),
     )?;
     println!("- Stock image has been backup to");
     println!("- {target}");
@@ -568,7 +568,7 @@ fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
 #[cfg(target_os = "android")]
 fn clean_backup(sha1: &str) -> Result<()> {
     println!("- Clean up backup");
-    let backup_name = format!("{}{}", KSU_BACKUP_FILE_PREFIX, sha1);
+    let backup_name = format!("{KSU_BACKUP_FILE_PREFIX}{sha1}");
     let dir = std::fs::read_dir(defs::KSU_BACKUP_DIR)?;
     for entry in dir.flatten() {
         let path = entry.path();

userspace/ksud/src/cli.rs

@@ -374,13 +374,13 @@ pub fn run() -> Result<()> {
         Commands::BootInfo { command } => match command {
             BootInfo::CurrentKmi => {
                 let kmi = crate::boot_patch::get_current_kmi()?;
-                println!("{}", kmi);
+                println!("{kmi}");
                 // return here to avoid printing the error message
                 return Ok(());
             }
             BootInfo::SupportedKmi => {
                 let kmi = crate::assets::list_supported_kmi()?;
-                kmi.iter().for_each(|kmi| println!("{}", kmi));
+                kmi.iter().for_each(|kmi| println!("{kmi}"));
                 return Ok(());
             }
         },
@@ -392,7 +392,7 @@ pub fn run() -> Result<()> {
     };
 
     if let Err(e) = &result {
-        log::error!("Error: {:?}", e);
+        log::error!("Error: {e:?}");
     }
     result
 }

userspace/ksud/src/debug.rs

@@ -30,7 +30,7 @@ fn set_kernel_param(uid: u32) -> Result<()> {
 fn get_pkg_uid(pkg: &str) -> Result<u32> {
     // stat /data/data/<pkg>
     let uid = rustix::fs::stat(format!("/data/data/{pkg}"))
-        .with_context(|| format!("stat /data/data/{}", pkg))?
+        .with_context(|| format!("stat /data/data/{pkg}"))?
         .st_uid;
     Ok(uid)
 }

userspace/ksud/src/init_event.rs

@@ -83,13 +83,13 @@ pub fn mount_modules_systemlessly(module_dir: &str) -> Result<()> {
 
     // mount /system first
     if let Err(e) = mount_partition("system", &system_lowerdir) {
-        warn!("mount system failed: {:#}", e);
+        warn!("mount system failed: {e:#}");
     }
 
     // mount other partitions
     for (k, v) in partition_lowerdir {
         if let Err(e) = mount_partition(&k, &v) {
-            warn!("mount {k} failed: {:#}", e);
+            warn!("mount {k} failed: {e:#}");
         }
     }
 
@@ -120,7 +120,7 @@ pub fn on_post_data_fs() -> Result<()> {
     } else {
         // Then exec common post-fs-data scripts
         if let Err(e) = crate::module::exec_common_scripts("post-fs-data.d", true) {
-            warn!("exec common post-fs-data scripts failed: {}", e);
+            warn!("exec common post-fs-data scripts failed: {e}");
         }
     }
 
@@ -168,17 +168,17 @@ pub fn on_post_data_fs() -> Result<()> {
     if safe_mode {
         warn!("safe mode, skip post-fs-data scripts and disable all modules!");
         if let Err(e) = crate::module::disable_all_modules() {
-            warn!("disable all modules failed: {}", e);
+            warn!("disable all modules failed: {e}");
         }
         return Ok(());
     }
 
     if let Err(e) = prune_modules() {
-        warn!("prune modules failed: {}", e);
+        warn!("prune modules failed: {e}");
     }
 
     if let Err(e) = restorecon::restorecon() {
-        warn!("restorecon failed: {}", e);
+        warn!("restorecon failed: {e}");
     }
 
     // load sepolicy.rule
@@ -187,28 +187,28 @@ pub fn on_post_data_fs() -> Result<()> {
     }
 
     if let Err(e) = crate::profile::apply_sepolies() {
-        warn!("apply root profile sepolicy failed: {}", e);
+        warn!("apply root profile sepolicy failed: {e}");
     }
 
     // mount temp dir
     if let Err(e) = mount::mount_tmpfs(defs::TEMP_DIR) {
-        warn!("do temp dir mount failed: {}", e);
+        warn!("do temp dir mount failed: {e}");
     }
 
     // exec modules post-fs-data scripts
     // TODO: Add timeout
     if let Err(e) = crate::module::exec_stage_script("post-fs-data", true) {
-        warn!("exec post-fs-data scripts failed: {}", e);
+        warn!("exec post-fs-data scripts failed: {e}");
     }
 
     // load system.prop
     if let Err(e) = crate::module::load_system_prop() {
-        warn!("load system.prop failed: {}", e);
+        warn!("load system.prop failed: {e}");
     }
 
     // mount module systemlessly by overlay
     if let Err(e) = mount_modules_systemlessly(module_dir) {
-        warn!("do systemless mount failed: {}", e);
+        warn!("do systemless mount failed: {e}");
     }
 
     run_stage("post-mount", true);
@@ -298,7 +298,7 @@ fn catch_bootlog(logname: &str, command: Vec<&str>) -> Result<()> {
     };
 
     if let Err(e) = result {
-        warn!("Failed to start logcat: {:#}", e);
+        warn!("Failed to start logcat: {e:#}");
     }
 
     Ok(())

userspace/ksud/src/module.rs

@@ -268,7 +268,7 @@ pub fn prune_modules() -> Result<()> {
         let uninstaller = module.join("uninstall.sh");
         if uninstaller.exists() {
             if let Err(e) = exec_script(uninstaller, true) {
-                warn!("Failed to exec uninstaller: {}", e);
+                warn!("Failed to exec uninstaller: {e}");
             }
         }
 
@@ -341,7 +341,7 @@ fn _install_module(zip: &str) -> Result<()> {
             module_prop.insert(k, v);
         },
     )?;
-    info!("module prop: {:?}", module_prop);
+    info!("module prop: {module_prop:?}");
 
     let Some(module_id) = module_prop.get("id") else {
         bail!("module id not found in module.prop!");
@@ -440,13 +440,13 @@ fn _install_module(zip: &str) -> Result<()> {
 
     let _dontdrop = mount::AutoMountExt4::try_new(tmp_module_img, module_update_tmp_dir, true)?;
 
-    info!("mounted {} to {}", tmp_module_img, module_update_tmp_dir);
+    info!("mounted {tmp_module_img} to {module_update_tmp_dir}");
 
     setsyscon(module_update_tmp_dir)?;
 
     let module_dir = format!("{module_update_tmp_dir}/{module_id}");
     ensure_clean_dir(&module_dir)?;
-    info!("module dir: {}", module_dir);
+    info!("module dir: {module_dir}");
 
     // unzip the image and move it to modules_update/<id> dir
     let file = File::open(zip)?;
@@ -584,7 +584,7 @@ pub fn uninstall_module(id: &str) -> Result<()> {
 }
 
 pub fn run_action(id: &str) -> Result<()> {
-    let action_script_path = format!("/data/adb/modules/{}/action.sh", id);
+    let action_script_path = format!("/data/adb/modules/{id}/action.sh");
     exec_script(&action_script_path, true)
 }
 
@@ -674,11 +674,11 @@ fn _list_modules(path: &str) -> Vec<HashMap<String, String>> {
         if !module_prop_map.contains_key("id") || module_prop_map["id"].is_empty() {
             match entry.file_name().to_str() {
                 Some(id) => {
-                    info!("Use dir name as module id: {}", 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);
+                    info!("Failed to get module id: {module_prop:?}");
                     continue;
                 }
             }

userspace/ksud/src/mount.rs

@@ -135,7 +135,7 @@ pub fn mount_overlayfs(
     })();
 
     if let Err(e) = result {
-        warn!("fsopen mount failed: {:#}, fallback to mount", e);
+        warn!("fsopen mount failed: {e:#}, fallback to mount");
         let mut data = format!("lowerdir={lowerdir_config}");
         if let (Some(upperdir), Some(workdir)) = (upperdir, workdir) {
             data = format!("{data},upperdir={upperdir},workdir={workdir}");
@@ -225,7 +225,7 @@ fn mount_overlay_child(
     }
     // merge modules and stock
     if let Err(e) = mount_overlayfs(&lower_dirs, stock_root, None, None, mount_point) {
-        warn!("failed: {:#}, fallback to bind mount", e);
+        warn!("failed: {e:#}, fallback to bind mount");
         bind_mount(stock_root, mount_point)?;
     }
     Ok(())
@@ -238,7 +238,7 @@ pub fn mount_overlay(
     workdir: Option<PathBuf>,
     upperdir: Option<PathBuf>,
 ) -> Result<()> {
-    info!("mount overlay for {}", root);
+    info!("mount overlay for {root}");
     std::env::set_current_dir(root).with_context(|| format!("failed to chdir to {root}"))?;
     let stock_root = ".";
 
@@ -269,10 +269,7 @@ pub fn mount_overlay(
             continue;
         }
         if let Err(e) = mount_overlay_child(mount_point, &relative, module_roots, &stock_root) {
-            warn!(
-                "failed to mount overlay for child {}: {:#}, revert",
-                mount_point, e
-            );
+            warn!("failed to mount overlay for child {mount_point}: {e:#}, revert");
             umount_dir(root).with_context(|| format!("failed to revert {root}"))?;
             bail!(e);
         }