chore: adopt Rust 2024

Cargo.toml

@@ -5,7 +5,7 @@
 name = "sysroot-cleaner"
 authors = ["Matteo Settenvini <matteo.settenvini@montecristosoftware.eu>"]
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "EUPL-1.2"
 readme = "README.md"
 

rust-toolchain.toml

@@ -3,6 +3,6 @@
 
 
 [toolchain]
-channel = "1.84"
+channel = "1.85"
 profile = "default"
 components = ["rustfmt"]

src/cleaners.rs

@@ -82,14 +82,14 @@ impl Runner {
 
     async fn paths_producer(tasks: &mut JoinSet<Result<(), Error>>) -> mpsc::Receiver<Decision> {
         let (input_tx, input_rx) = mpsc::channel(CHANNEL_SIZE);
-        let walker = WalkDir::new(".").follow_links(false);
+        let walker = WalkDir::new(".").follow_links(false).same_file_system(true);
         tasks.spawn(async move {
             for entry in walker {
                 match entry {
                     Ok(e) if !Self::is_dir(&e) => {
                         input_tx
                             .send(Decision {
-                                path: e.into_path(),
+                                path: e.into_path().strip_prefix(".")?.to_path_buf(),
                                 action: Action::Undecided,
                             })
                             .await?;

src/cleaners/dso.rs

@@ -77,7 +77,6 @@ impl Cleaner for DsoCleaner {
             if decision.action == Action::Keep {
                 let ino = nix::sys::stat::lstat(&decision.path)?.st_ino;
                 inodes_to_keep.insert(ino);
-                dbg!(&decision.path, ino);
             }
 
             // If something was marked as "keep" or "remove" before,
@@ -111,10 +110,6 @@ impl Cleaner for DsoCleaner {
             };
 
             for path in paths {
-                if path.display().to_string().contains("libjsonrpccpp-server") {
-                    dbg!(inode, &path, action);
-                }
-
                 output.send(Decision { path, action }).await?;
             }
         }