various: new clippy, new fixups!

Some of these are longstanding nags, others are nice suggestions from
the incoming clippy version in our CI container.

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

Author: allisonkarlitskaya

src/dumpfile_parse.rs

@@ -891,8 +891,9 @@ mod tests {
         mkcomposefs(SPECIAL_DUMP, &mut tmpf).unwrap();
         let mut entries = String::new();
         tmpf.seek(std::io::SeekFrom::Start(0))?;
-        let mut filter = DumpConfig::default();
-        filter.filters = Some(&["blockdev", "inline"]);
+        let filter = DumpConfig {
+            filters: Some(&["blockdev", "inline"]),
+        };
         dump(tmpf, filter, |e| {
             writeln!(entries, "{e}")?;
             Ok(())

src/erofs/debug.rs

@@ -250,7 +250,7 @@ fn hexdump(f: &mut impl fmt::Write, data: &[u8], rel: usize) -> fmt::Result {
     };
     let end = start + data.len();
     let start_row = start / 16;
-    let end_row = (end + 15) / 16;
+    let end_row = end.div_ceil(16);
 
     for row in start_row..end_row {
         let row_start = row * 16;

src/erofs/writer.rs

@@ -251,9 +251,9 @@ impl<'a> Directory<'a> {
     }
 
     fn inode_meta(&self, block_offset: usize) -> (format::DataLayout, u32, u64, usize) {
-        let (layout, u) = if self.inline.len() == 0 {
+        let (layout, u) = if self.inline.is_empty() {
             (format::DataLayout::FlatPlain, block_offset as u32 / 4096)
-        } else if self.blocks.len() > 0 {
+        } else if !self.blocks.is_empty() {
             (format::DataLayout::FlatInline, block_offset as u32 / 4096)
         } else {
             (format::DataLayout::FlatInline, 0)

src/fsverity/ioctl.rs

@@ -152,7 +152,7 @@ mod tests {
     #[test]
     fn test_fs_ioc_enable_verity_wrong_fs() {
         let file = tempfile_in("/dev/shm").unwrap();
-        let fd = OwnedFd::try_from(file).unwrap();
+        let fd = OwnedFd::from(file);
         let res = fs_ioc_enable_verity::<&OwnedFd, Sha256HashValue>(&fd);
         let err = res.err().unwrap();
         assert_eq!(err, EnableVerifyError::FilesystemNotSupported);

tests/repo.rs

@@ -46,7 +46,7 @@ fn test_layer() -> Result<()> {
     let layer_id: [u8; 32] = context.finalize().into();
 
     let tmpfile = tempfile::TempDir::with_prefix_in("composefs-test-", test_global_tmpdir()?)?;
-    let repo = Repository::open_path(CWD, tmpfile.path().to_path_buf())?;
+    let repo = Repository::open_path(CWD, tmpfile.path())?;
     let id = oci::import_layer(&repo, &layer_id, Some("name"), &mut layer.as_slice())?;
 
     let mut dump = String::new();