various: clippy fixes

This patch is machine-generated.

Author: allisonkarlitskaya

crates/composefs-oci/src/skopeo.rs

@@ -116,7 +116,7 @@ impl<ObjectID: FsVerityHashValue> ImageOp<ObjectID> {
                 MediaType::ImageLayerZstd => {
                     split_async(ZstdDecoder::new(progress), &mut splitstream).await?;
                 }
-                other => bail!("Unsupported layer media type {:?}", other),
+                other => bail!("Unsupported layer media type {other:?}"),
             };
             let layer_id = self.repo.write_stream(splitstream, None)?;
 

crates/composefs-oci/src/tar.rs

@@ -692,26 +692,22 @@ mod tests {
         assert_eq!(
             header.mode().unwrap(),
             stat.st_mode,
-            "{}: mode mismatch",
-            msg_prefix
+            "{msg_prefix}: mode mismatch"
         );
         assert_eq!(
             header.uid().unwrap() as u32,
             stat.st_uid,
-            "{}: uid mismatch",
-            msg_prefix
+            "{msg_prefix}: uid mismatch"
         );
         assert_eq!(
             header.gid().unwrap() as u32,
             stat.st_gid,
-            "{}: gid mismatch",
-            msg_prefix
+            "{msg_prefix}: gid mismatch"
         );
         assert_eq!(
             header.mtime().unwrap() as i64,
             stat.st_mtim_sec,
-            "{}: mtime mismatch",
-            msg_prefix
+            "{msg_prefix}: mtime mismatch"
         );
     }
 }

crates/composefs/src/dumpfile.rs

@@ -339,15 +339,15 @@ pub fn add_entry_to_filesystem<ObjectID: FsVerityHashValue>(
     let parent = path.parent().unwrap_or_else(|| Path::new("/"));
     let filename = path
         .file_name()
-        .ok_or_else(|| anyhow::anyhow!("Path has no filename: {:?}", path))?;
+        .ok_or_else(|| anyhow::anyhow!("Path has no filename: {path:?}"))?;
 
     // Get or create parent directory
     let parent_dir = if parent == Path::new("/") {
         &mut fs.root
     } else {
         fs.root
             .get_directory_mut(parent.as_os_str())
-            .with_context(|| format!("Parent directory not found: {:?}", parent))?
+            .with_context(|| format!("Parent directory not found: {parent:?}"))?
     };
 
     // Convert the entry to an inode
@@ -360,7 +360,7 @@ pub fn add_entry_to_filesystem<ObjectID: FsVerityHashValue>(
             // Look up the target in our hardlinks map and clone the Rc
             let target_leaf = hardlinks
                 .get(target.as_ref())
-                .ok_or_else(|| anyhow::anyhow!("Hardlink target not found: {:?}", target))?
+                .ok_or_else(|| anyhow::anyhow!("Hardlink target not found: {target:?}"))?
                 .clone();
             Inode::Leaf(target_leaf)
         }
@@ -456,8 +456,8 @@ pub fn dumpfile_to_filesystem<ObjectID: FsVerityHashValue>(
         if line.trim().is_empty() {
             continue;
         }
-        let entry = Entry::parse(line)
-            .with_context(|| format!("Failed to parse dumpfile line: {}", line))?;
+        let entry =
+            Entry::parse(line).with_context(|| format!("Failed to parse dumpfile line: {line}"))?;
         add_entry_to_filesystem(&mut fs, entry, &mut hardlinks)?;
     }
 

crates/composefs/src/dumpfile_parse.rs

@@ -328,20 +328,12 @@ impl<'k> Xattr<'k> {
         let key = unescape_to_osstr(key)?;
         let keylen = key.as_bytes().len();
         if keylen > XATTR_NAME_MAX {
-            anyhow::bail!(
-                "xattr name too long; max={} found={}",
-                XATTR_NAME_MAX,
-                keylen
-            );
+            anyhow::bail!("xattr name too long; max={XATTR_NAME_MAX} found={keylen}");
         }
         let value = unescape(value)?;
         let valuelen = value.len();
         if valuelen > XATTR_SIZE_MAX {
-            anyhow::bail!(
-                "xattr value too long; max={} found={}",
-                XATTR_SIZE_MAX,
-                keylen
-            );
+            anyhow::bail!("xattr value too long; max={XATTR_SIZE_MAX} found={keylen}");
         }
         Ok(Self { key, value })
     }
@@ -440,7 +432,7 @@ impl<'p> Entry<'p> {
                         unescape_to_path(payload.ok_or_else(|| anyhow!("Missing payload"))?)?;
                     let targetlen = target.as_os_str().as_bytes().len();
                     if targetlen > PATH_MAX as usize {
-                        anyhow::bail!("Target length too large {}", targetlen);
+                        anyhow::bail!("Target length too large {targetlen}");
                     }
                     Item::Symlink { nlink, target }
                 }

crates/composefs/src/erofs/reader.rs

@@ -694,8 +694,7 @@ mod tests {
 
         assert_eq!(
             found_names, expected_sorted,
-            "Directory entries mismatch for nid {}",
-            nid
+            "Directory entries mismatch for nid {nid}"
         );
     }
 
@@ -788,8 +787,7 @@ mod tests {
         // Add many files to force directory blocks
         for i in 0..100 {
             dumpfile.push_str(&format!(
-                "/bigdir/file{:03} 5 100644 1 0 0 0 1000.0 - hello -\n",
-                i
+                "/bigdir/file{i:03} 5 100644 1 0 0 0 1000.0 - hello -\n"
             ));
         }
 
@@ -824,7 +822,7 @@ mod tests {
         // Build expected names
         let mut expected: Vec<String> = vec![".".to_string(), "..".to_string()];
         for i in 0..100 {
-            expected.push(format!("file{:03}", i));
+            expected.push(format!("file{i:03}"));
         }
         let expected_refs: Vec<&str> = expected.iter().map(|s| s.as_str()).collect();
 

crates/composefs/src/fsverity/mod.rs

@@ -311,7 +311,7 @@ mod tests {
 
     use super::*;
 
-    static TEMPDIR: Lazy<TempDir> = Lazy::new(|| tempdir());
+    static TEMPDIR: Lazy<TempDir> = Lazy::new(tempdir);
     static TD_FD: Lazy<File> = Lazy::new(|| File::open(TEMPDIR.path()).unwrap());
 
     fn tempfile() -> File {