Add uninlined_format_args lint and fix where relevant

I keep forgetting this syntax exists, and other maintainers
seem to be fond of it.

Signed-off-by: Sasha Finkelstein <[email protected]>

Author: WhatAmISupposedToPutHere

crates/muvm/Cargo.toml

@@ -35,3 +35,6 @@ path = "src/bin/muvm.rs"
 [[bin]]
 name = "muvm-guest"
 path = "src/guest/bin/muvm-guest.rs"
+
+[lints.clippy]
+uninlined_format_args = "warn"

crates/muvm/src/bin/muvm.rs

@@ -314,7 +314,7 @@ fn main() -> Result<ExitCode> {
         std::fs::create_dir_all(&socket_dir)?;
         // Dynamic ports: Applications may listen on these sockets as neeeded.
         for port in DYNAMIC_PORT_RANGE {
-            let socket_path = socket_dir.join(format!("port-{}", port));
+            let socket_path = socket_dir.join(format!("port-{port}"));
             let socket_path = CString::new(
                 socket_path
                     .to_str()
@@ -333,7 +333,7 @@ fn main() -> Result<ExitCode> {
     // Forward the native X11 display into the guest as a socket
     if let Ok(x11_display) = env::var("DISPLAY") {
         if let Some(x11_display) = x11_display.strip_prefix(':') {
-            let socket_path = Path::new("/tmp/.X11-unix/").join(format!("X{}", x11_display));
+            let socket_path = Path::new("/tmp/.X11-unix/").join(format!("X{x11_display}"));
             if socket_path.exists() {
                 let socket_path = CString::new(
                     socket_path

crates/muvm/src/guest/hidpipe.rs

@@ -265,7 +265,7 @@ pub fn start_hidpipe(user_id: u32) {
                         dev.unwrap().ff_erase_end(&ff_ers).unwrap();
                     }
                 },
-                m => panic!("Unknown message {}", m),
+                m => panic!("Unknown message {m}"),
             }
         } else if let Some(id) = fd_to_id.get(&fd) {
             let uinput = inputs_by_id.get(id).unwrap();

crates/muvm/src/guest/mount.rs

@@ -316,8 +316,7 @@ pub fn mount_filesystems(merged_rootfs: bool) -> Result<()> {
     // Do this last so it can pick up all the submounts made above.
     if let Err(e) = mount_fex_rootfs(merged_rootfs) {
         println!(
-            "Failed to mount FEX rootfs, carrying on without. Error: {}",
-            e
+            "Failed to mount FEX rootfs, carrying on without. Error: {e}"
         );
     }
 

crates/muvm/src/guest/server.rs

@@ -16,7 +16,7 @@ pub async fn server_main(
     command: PathBuf,
     command_args: Vec<String>,
 ) -> Result<()> {
-    let listener = TcpListener::bind(format!("0.0.0.0:{}", server_port)).await?;
+    let listener = TcpListener::bind(format!("0.0.0.0:{server_port}")).await?;
     let (state_tx, state_rx) = watch::channel(State::new());
 
     let mut worker_handle = tokio::spawn(async move {
@@ -50,8 +50,7 @@ pub async fn server_main(
                         if !status.success() {
                             if let Some(code) = status.code() {
                                 eprintln!(
-                                    "{:?} process exited with status code: {code}",
-                                    command
+                                    "{command:?} process exited with status code: {code}"
                                 );
                             } else {
                                 eprintln!(
@@ -66,8 +65,7 @@ pub async fn server_main(
                     },
                     Err(err) => {
                         eprintln!(
-                            "Failed to execute {:?} as child process: {err}",
-                            command
+                            "Failed to execute {command:?} as child process: {err}"
                         );
                     },
                 }

crates/muvm/src/guest/socket.rs

@@ -28,7 +28,7 @@ where
                 .to_str()
                 .expect("socket_path should not contain invalid UTF-8")
         ))
-        .arg(format!("VSOCK-CONNECT:2:{}", port))
+        .arg(format!("VSOCK-CONNECT:2:{port}"))
         .stdin(Stdio::null())
         .stdout(stdout)
         .stderr(stderr)

crates/muvm/src/guest/x11.rs

@@ -24,7 +24,7 @@ where
     env::set_var("XSHMFENCE_NO_MEMFD", "1");
 
     if let Ok(xauthority) = std::env::var("XAUTHORITY") {
-        let src_path = format!("/run/muvm-host/{}", xauthority);
+        let src_path = format!("/run/muvm-host/{xauthority}");
         let mut rdr = File::open(src_path)?;
 
         let dst_path = run_path.as_ref().join("xauth");

crates/muvm/src/guest/x11bridge.rs

@@ -1086,7 +1086,7 @@ impl Client {
 
     fn ptrace_all_threads(pid: Pid) -> Result<Vec<PtracedPid>> {
         let mut tids = Vec::new();
-        for entry in fs::read_dir(format!("/proc/{}/task", pid))? {
+        for entry in fs::read_dir(format!("/proc/{pid}/task"))? {
             let entry = match entry {
                 Err(_) => continue,
                 Ok(a) => a,
@@ -1104,7 +1104,7 @@ impl Client {
                 if tid == pid {
                     return Err(e.into());
                 }
-                eprintln!("ptrace::attach({}, ...) failed (continuing)", pid);
+                eprintln!("ptrace::attach({pid}, ...) failed (continuing)");
                 continue;
             }
             let ptid = PtracedPid(tid);
@@ -1129,7 +1129,7 @@ impl Client {
         // TODO: match st_dev too to avoid false positives
         let my_ino = fstat(my_fd)?.st_ino;
         let mut fds_to_replace = Vec::new();
-        for entry in fs::read_dir(format!("/proc/{}/fd", pid))? {
+        for entry in fs::read_dir(format!("/proc/{pid}/fd"))? {
             let entry = entry?;
             if let Ok(file) = File::options().open(entry.path()) {
                 if fstat(file.as_raw_fd())?.st_ino == my_ino {
@@ -1138,7 +1138,7 @@ impl Client {
             }
         }
         let mut pages_to_replace = Vec::new();
-        for line in read_to_string(format!("/proc/{}/maps", pid))?.lines() {
+        for line in read_to_string(format!("/proc/{pid}/maps"))?.lines() {
             let f: Vec<&str> = line.split_whitespace().collect();
             let ino: u64 = f[4].parse()?;
             if ino == my_ino {
@@ -1290,7 +1290,7 @@ impl Client {
                 self.process_futex_signal(recv)?;
             },
             a => {
-                eprintln!("Received unknown cross-domain command {}", a);
+                eprintln!("Received unknown cross-domain command {a}");
             },
         };
         self.gpu_ctx.poll_cmd()?;
@@ -1445,7 +1445,7 @@ fn find_vdso(pid: Option<Pid>) -> Result<(usize, usize), Errno> {
 }
 
 pub fn start_x11bridge(display: u32) {
-    let sock_path = format!("/tmp/.X11-unix/X{}", display);
+    let sock_path = format!("/tmp/.X11-unix/X{display}");
 
     // Look for a syscall instruction in the vDSO. We assume all processes map
     // the same vDSO (which should be true if they are running under the same
@@ -1524,7 +1524,7 @@ pub fn start_x11bridge(display: u32) {
                     .borrow_mut()
                     .process_socket(events)
                     .map_err(|e| {
-                        eprintln!("Client {} disconnected with error: {:?}", fd, e);
+                        eprintln!("Client {fd} disconnected with error: {e:?}");
                         e
                     })
                     .unwrap_or(ClientEvent::Close);
@@ -1569,7 +1569,7 @@ pub fn start_x11bridge(display: u32) {
                     .borrow_mut()
                     .process_vgpu()
                     .map_err(|e| {
-                        eprintln!("Server {} disconnected with error: {:?}", fd, e);
+                        eprintln!("Server {fd} disconnected with error: {e:?}");
                         e
                     })
                     .unwrap_or(true);