src: clippy fixes

Signed-off-by: Allison Karlitskaya <[email protected]>

Author: allisonkarlitskaya

src/dumpfile.rs

@@ -29,7 +29,7 @@ fn write_escaped(writer: &mut impl fmt::Write, bytes: &[u8]) -> fmt::Result {
         let c = *c;
 
         if c < b'!' || c == b'=' || c == b'\\' || c > b'~' {
-            write!(writer, "\\x{:02x}", c)?;
+            write!(writer, "\\x{c:02x}")?;
         } else {
             writer.write_char(c as char)?;
         }
@@ -66,7 +66,7 @@ fn write_entry(
     write_escaped(writer, content)?;
     write!(writer, " ")?;
     if let Some(id) = digest {
-        write!(writer, "{}", id)?;
+        write!(writer, "{id}")?;
     } else {
         write_empty(writer)?;
     }
@@ -212,7 +212,7 @@ struct DumpfileWriter<'a, W: Write, ObjectID: FsVerityHashValue> {
 fn writeln_fmt(writer: &mut impl Write, f: impl Fn(&mut String) -> fmt::Result) -> Result<()> {
     let mut tmp = String::with_capacity(256);
     f(&mut tmp)?;
-    Ok(writeln!(writer, "{}", tmp)?)
+    Ok(writeln!(writer, "{tmp}")?)
 }
 
 impl<'a, W: Write, ObjectID: FsVerityHashValue> DumpfileWriter<'a, W, ObjectID> {

src/dumpfile_parse.rs

@@ -291,7 +291,7 @@ fn escape<W: std::fmt::Write>(out: &mut W, s: &[u8], mode: EscapeMode) -> std::f
                 b'\n' => out.write_str(r"\n")?,
                 b'\t' => out.write_str(r"\t")?,
                 b'\r' => out.write_str(r"\r")?,
-                o => write!(out, "\\x{:02x}", o)?,
+                o => write!(out, "\\x{o:02x}")?,
             }
         }
     }

src/erofs/debug.rs

@@ -47,7 +47,7 @@ macro_rules! write_fields {
 
 fn utf8_or_hex(data: &[u8]) -> String {
     if let Ok(string) = std::str::from_utf8(data) {
-        format!("{:?}", string)
+        format!("{string:?}")
     } else {
         hex::encode(data)
     }
@@ -322,8 +322,7 @@ impl<T: fmt::Debug + InodeHeader> fmt::Debug for Inode<T> {
             let offset = addr!(dir) - addr!(self);
             return write!(
                 f,
-                "     +{offset:02x} --- inline directory entries ---{:#?}",
-                dir
+                "     +{offset:02x} --- inline directory entries ---{dir:#?}"
             );
         }
 

src/oci/mod.rs

@@ -37,7 +37,7 @@ pub fn ls_layer<ObjectID: FsVerityHashValue>(
     let mut split_stream = repo.open_stream(name, None)?;
 
     while let Some(entry) = get_entry(&mut split_stream)? {
-        println!("{}", entry);
+        println!("{entry}");
     }
 
     Ok(())
@@ -387,7 +387,7 @@ mod test {
         let mut dump = String::new();
         let mut split_stream = repo.open_stream("refs/name", Some(&id)).unwrap();
         while let Some(entry) = tar::get_entry(&mut split_stream).unwrap() {
-            writeln!(dump, "{}", entry).unwrap();
+            writeln!(dump, "{entry}").unwrap();
         }
         similar_asserts::assert_eq!(dump, "\
 /file0 0 100700 1 0 0 0 0.0 - - -

src/repository.rs

@@ -324,7 +324,7 @@ impl<ObjectID: FsVerityHashValue> Repository<ObjectID> {
         name: &str,
         verity: Option<&ObjectID>,
     ) -> Result<SplitStreamReader<File, ObjectID>> {
-        let filename = format!("streams/{}", name);
+        let filename = format!("streams/{name}");
 
         let file = File::from(if let Some(verity_hash) = verity {
             self.open_with_verity(&filename, verity_hash)?
@@ -365,7 +365,7 @@ impl<ObjectID: FsVerityHashValue> Repository<ObjectID> {
         self.ensure_symlink(&image_path, &object_path)?;
 
         if let Some(reference) = name {
-            let ref_path = format!("images/refs/{}", reference);
+            let ref_path = format!("images/refs/{reference}");
             self.symlink(&ref_path, &image_path)?;
         }
 
@@ -380,7 +380,7 @@ impl<ObjectID: FsVerityHashValue> Repository<ObjectID> {
     }
 
     pub fn open_image(&self, name: &str) -> Result<OwnedFd> {
-        let image = self.openat(&format!("images/{}", name), OFlags::RDONLY)?;
+        let image = self.openat(&format!("images/{name}"), OFlags::RDONLY)?;
 
         if !name.contains("/") {
             // A name with no slashes in it is taken to be a sha256 fs-verity digest

src/splitstream.rs

@@ -392,7 +392,7 @@ impl<F: Read, ObjectID: FsVerityHashValue> Read for SplitStreamReader<F, ObjectI
                 Ok(n_bytes)
             }
             Ok(ChunkType::External(..)) => unreachable!(),
-            Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
+            Err(e) => Err(std::io::Error::other(e)),
         }
     }
 }

src/tree.rs

@@ -587,7 +587,7 @@ mod tests {
         }
         match dir.get_file(OsStr::new("link.txt")) {
             Err(ImageError::IsNotRegular(name)) => assert_eq!(name.to_str().unwrap(), "link.txt"),
-            res => panic!("Expected IsNotRegular, got {:?}", res),
+            res => panic!("Expected IsNotRegular, got {res:?}"),
         }
     }
 
@@ -600,7 +600,7 @@ mod tests {
 
         dir.remove(OsStr::new("file1.txt"));
         assert_eq!(dir.entries.len(), 1);
-        assert!(dir.entries.get(OsStr::new("file1.txt")).is_none());
+        assert!(!dir.entries.contains_key(OsStr::new("file1.txt")));
 
         dir.remove(OsStr::new("nonexistent")); // Should be no-op
         assert_eq!(dir.entries.len(), 1);
@@ -635,7 +635,7 @@ mod tests {
             Some(Inode::Directory(d)) => {
                 assert_eq!(d.stat.st_mtim_sec, 90); // Stat updated
                 assert_eq!(d.entries.len(), 1); // Inner file preserved
-                assert!(d.entries.get(OsStr::new("inner_file")).is_some());
+                assert!(d.entries.contains_key(OsStr::new("inner_file")));
             }
             _ => panic!("Expected directory after merge"),
         }