refactor: bump edition to 2024

Cargo.toml

@@ -3,7 +3,7 @@ name = "findutils"
 version = "0.11.0"
 homepage = "https://github.com/uutils/findutils"
 repository = "https://github.com/uutils/findutils"
-edition = "2021"
+edition = "2024"
 rust-version = "1.88.0"
 license = "MIT"
 readme = "README.md"

benches/find_bench.rs

@@ -14,8 +14,8 @@ use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::time::SystemTime;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use findutils::find::{find_main, Dependencies};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
+use findutils::find::{Dependencies, find_main};
 
 /// `Dependencies` implementation that throws output away. A fixed `now` keeps
 /// time-based matchers (`-newer`, `-mtime`, …) deterministic across runs.

benches/locate_bench.rs

@@ -16,7 +16,7 @@
 mod bench {
     use std::path::{Path, PathBuf};
 
-    use criterion::{black_box, criterion_group, Criterion};
+    use criterion::{Criterion, black_box, criterion_group};
     use findutils::locate::locate_main;
     use findutils::updatedb::updatedb_main;
 

benches/updatedb_bench.rs

@@ -11,7 +11,7 @@
 
 use std::path::{Path, PathBuf};
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use findutils::updatedb::updatedb_main;
 
 /// Run `updatedb` end-to-end. `args` are the arguments after the program name.

benches/xargs_bench.rs

@@ -12,7 +12,7 @@
 
 use std::path::PathBuf;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use findutils::xargs::xargs_main;
 
 /// Run `xargs` end-to-end. `args` are the arguments after the program name.

src/find/matchers/delete.rs

@@ -8,7 +8,7 @@
  */
 
 use std::fs;
-use std::io::{self, stderr, Write};
+use std::io::{self, Write, stderr};
 
 use super::{Matcher, MatcherIO, WalkEntry};
 
@@ -57,7 +57,7 @@ impl Matcher for DeleteMatcher {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{create_dir, File};
+    use std::fs::{File, create_dir};
     use tempfile::Builder;
 
     use super::*;

src/find/matchers/empty.rs

@@ -6,7 +6,7 @@
 
 use std::{
     fs::read_dir,
-    io::{stderr, Write},
+    io::{Write, stderr},
 };
 
 use super::{Matcher, MatcherIO, WalkEntry};

src/find/matchers/entry.rs

@@ -239,14 +239,14 @@ impl WalkEntry {
             }
             Err(e) if e.is_not_found() => {
                 // Detect broken symlinks and replace them with explicit entries
-                if let (Some(path), Some(depth)) = (e.path(), e.depth()) {
-                    if let Ok(meta) = path.symlink_metadata() {
-                        return Ok(Self {
-                            inner: Entry::Explicit(path.into(), depth),
-                            follow: Follow::Never,
-                            meta: Ok(meta).into(),
-                        });
-                    }
+                if let (Some(path), Some(depth)) = (e.path(), e.depth())
+                    && let Ok(meta) = path.symlink_metadata()
+                {
+                    return Ok(Self {
+                        inner: Entry::Explicit(path.into(), depth),
+                        follow: Follow::Never,
+                        meta: Ok(meta).into(),
+                    });
                 }
 
                 Err(e)

src/find/matchers/exec.rs

@@ -7,7 +7,7 @@
 use std::cell::RefCell;
 use std::error::Error;
 use std::ffi::{OsStr, OsString};
-use std::io::{stderr, Write};
+use std::io::{Write, stderr};
 use std::path::Path;
 use std::process::Command;
 

src/find/matchers/fs.rs

@@ -28,7 +28,7 @@ pub struct Cache {
 #[cfg(unix)]
 use std::{
     cell::RefCell,
-    io::{stderr, Write},
+    io::{Write, stderr},
     path::Path,
 };
 
@@ -54,10 +54,10 @@ pub fn get_file_system_type(path: &Path, cache: &RefCell<Option<Cache>>) -> URes
 /// This is only supported on Unix.
 #[cfg(unix)]
 pub fn fs_type_for_dev(dev_id: String, cache: &RefCell<Option<Cache>>) -> UResult<String> {
-    if let Some(cache) = cache.borrow().as_ref() {
-        if cache.dev_id == dev_id {
-            return Ok(cache.fs_type.clone());
-        }
+    if let Some(cache) = cache.borrow().as_ref()
+        && cache.dev_id == dev_id
+    {
+        return Ok(cache.fs_type.clone());
     }
 
     let fs_list = uucore::fsext::read_fs_list()?;
@@ -148,9 +148,9 @@ mod tests {
     fn test_fs_matcher() {
         use crate::find::{
             matchers::{
-                fs::{get_file_system_type, Cache},
-                tests::get_dir_entry_for,
                 Matcher,
+                fs::{Cache, get_file_system_type},
+                tests::get_dir_entry_for,
             },
             tests::FakeDependencies,
         };

src/find/matchers/group.rs

@@ -93,7 +93,7 @@ mod tests {
     #[test]
     #[cfg(unix)]
     fn test_group_matcher() {
-        use crate::find::matchers::{group::GroupMatcher, tests::get_dir_entry_for, Matcher};
+        use crate::find::matchers::{Matcher, group::GroupMatcher, tests::get_dir_entry_for};
         use crate::find::tests::FakeDependencies;
         use chrono::Local;
         use nix::unistd::{Gid, Group};

src/find/matchers/lname.rs

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-use std::io::{stderr, Write};
+use std::io::{Write, stderr};
 use std::path::PathBuf;
 
 use super::glob::Pattern;

src/find/matchers/ls.rs

@@ -6,7 +6,7 @@
 use chrono::DateTime;
 use std::{
     fs::File,
-    io::{stderr, Write},
+    io::{Write, stderr},
 };
 
 use super::{Matcher, MatcherIO, StdoutErrors, WalkEntry};
@@ -87,12 +87,11 @@ impl Ls {
             now_utc.format("%b %e %H:%M")
         };
         let mut path = file_info.path().to_string_lossy().into_owned();
-        if file_info.file_type().is_symlink() {
-            if let Ok(target) = std::fs::read_link(file_info.path()) {
+        if file_info.file_type().is_symlink()
+            && let Ok(target) = std::fs::read_link(file_info.path()) {
                 path.push_str(" -> ");
                 path.push_str(&target.to_string_lossy());
             }
-        }
 
         match writeln!(
             out,