tree-wide: Use inline format! args in most places

I find this easier to read.

Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

build.rs

@@ -38,9 +38,9 @@ fn generate_man_page<P: AsRef<Path>>(outdir: P, command: &str) -> io::Result<()>
     }
 
     let outdir = outdir.as_ref();
-    let outfile = outdir.join(format!("{}.1", command));
+    let outfile = outdir.join(format!("{command}.1"));
     let cwd = env::current_dir()?;
-    let txt_path = cwd.join("docs").join(format!("{}.1.txt", command));
+    let txt_path = cwd.join("docs").join(format!("{command}.1.txt"));
 
     let result = process::Command::new("asciidoctor")
         .arg("--doctype")

src/create.rs

@@ -12,9 +12,9 @@ use super::utils::{
 use crate::{ArgMatches, KrunvmConfig, VmConfig, APP_NAME};
 
 fn fix_resolv_conf(rootfs: &str, dns: &str) -> Result<(), std::io::Error> {
-    let resolvconf_dir = format!("{}/etc/", rootfs);
+    let resolvconf_dir = format!("{rootfs}/etc/");
     fs::create_dir_all(resolvconf_dir)?;
-    let resolvconf = format!("{}/etc/resolv.conf", rootfs);
+    let resolvconf = format!("{rootfs}/etc/resolv.conf");
     let mut file = fs::File::create(resolvconf)?;
     file.write_all(b"options use-vc\nnameserver ")?;
     file.write_all(dns.as_bytes())?;

src/start.rs

@@ -45,7 +45,7 @@ fn map_volumes(_ctx: u32, vmcfg: &VmConfig, rootfs: &str) {
 fn map_volumes(ctx: u32, vmcfg: &VmConfig, rootfs: &str) {
     let mut volumes = Vec::new();
     for (host_path, guest_path) in vmcfg.mapped_volumes.iter() {
-        let full_guest = format!("{}{}", &rootfs, guest_path);
+        let full_guest = format!("{rootfs}{guest_path}");
         let full_guest_path = Path::new(&full_guest);
         if !full_guest_path.exists() {
             std::fs::create_dir(full_guest_path)
@@ -163,7 +163,7 @@ fn set_rlimits() {
 }
 
 fn set_lock(rootfs: &str) -> File {
-    let lock_path = format!("{}/.krunvm.lock", rootfs);
+    let lock_path = format!("{rootfs}/.krunvm.lock");
     let file = File::create(lock_path).expect("Couldn't create lock file");
 
     let ret = unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) };

src/utils.rs

@@ -30,8 +30,8 @@ pub fn get_buildah_args(cfg: &KrunvmConfig, cmd: BuildahCommand) -> Vec<String>
     hbpath.pop();
     hbpath.pop();
     let hbpath = hbpath.as_path().display();
-    let policy_json = format!("{}/etc/containers/policy.json", hbpath);
-    let registries_json = format!("{}/etc/containers/registries.conf", hbpath);
+    let policy_json = format!("{hbpath}/etc/containers/policy.json");
+    let registries_json = format!("{hbpath}/etc/containers/registries.conf");
     let storage_root = format!("{}/root", cfg.storage_volume);
     let storage_runroot = format!("{}/runroot", cfg.storage_volume);