build(msrv): Update msrv to 1.90.0

And upgrade to 2024 edition

Author: tmccombs

.github/workflows/CICD.yml

@@ -116,9 +116,7 @@ jobs:
       uses: dtolnay/rust-toolchain@stable
       with:
         targets: ${{ matrix.job.target }}
-        # On windows, for now build with 1.77.2, so that it works on windows 7.
-        # When we update the MSRV again, we'll need to revisit this, and probably drop support for Win7
-        toolchain: "${{ contains(matrix.job.target, 'windows-') && '1.77.2' || 'stable' }}"
+        toolchain: "stable"
 
     - name: Install cross
       if: matrix.job.use-cross

Cargo.lock

@@ -17,8 +17,8 @@ name = "fd-find"
 readme = "README.md"
 repository = "https://github.com/sharkdp/fd"
 version = "10.3.0"
-edition= "2021"
-rust-version = "1.77.2"
+edition= "2024"
+rust-version = "1.90.0"
 
 [badges.appveyor]
 repository = "sharkdp/fd"
@@ -35,7 +35,7 @@ aho-corasick = "1.1"
 nu-ansi-term = "0.50"
 argmax = "0.4.0"
 ignore = "0.4.24"
-regex = "1.11.2"
+regex = "1.12.2"
 regex-syntax = "0.8"
 ctrlc = "3.4"
 globset = "0.4"
@@ -46,9 +46,6 @@ crossbeam-channel = "0.5.15"
 clap_complete = {version = "4.5.58", optional = true}
 faccess = "0.2.4"
 jiff = "0.2.14"
-# For now, pin the `home` crate to less than 0.5.11, to ensure it works on older versions of rust
-# TODO: when we upgrade past rust 1.85, remove this dependency
-home = "=0.5.9"
 
 [dependencies.clap]
 version = "4.5.48"

Cargo.toml

@@ -4,8 +4,8 @@ use std::time::Duration;
 
 use anyhow::anyhow;
 use clap::{
-    error::ErrorKind, value_parser, Arg, ArgAction, ArgGroup, ArgMatches, Command, Parser,
-    ValueEnum,
+    Arg, ArgAction, ArgGroup, ArgMatches, Command, Parser, ValueEnum, error::ErrorKind,
+    value_parser,
 };
 #[cfg(feature = "completions")]
 use clap_complete::Shell;

src/cli.rs

@@ -2,7 +2,7 @@ use std::sync::Mutex;
 
 use crate::config::Config;
 use crate::error::print_error;
-use crate::exit_codes::{merge_exitcodes, ExitCode};
+use crate::exit_codes::{ExitCode, merge_exitcodes};
 use crate::walk::WorkerResult;
 
 use super::CommandSet;

src/exec/job.rs

@@ -8,10 +8,10 @@ use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::sync::Mutex;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use argmax::Command;
 
-use crate::exit_codes::{merge_exitcodes, ExitCode};
+use crate::exit_codes::{ExitCode, merge_exitcodes};
 use crate::fmt::{FormatTemplate, Token};
 
 use self::command::{execute_commands, handle_cmd_error};

src/exec/mod.rs

@@ -1,7 +1,7 @@
 use std::process;
 
 #[cfg(unix)]
-use nix::sys::signal::{raise, signal, SigHandler, Signal};
+use nix::sys::signal::{SigHandler, Signal, raise, signal};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ExitCode {

src/exit_codes.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use nix::unistd::{Group, User};
 use std::fs;
 

src/filter/owner.rs

@@ -1,4 +1,4 @@
-use jiff::{civil::DateTime, tz::TimeZone, Span, Timestamp, Zoned};
+use jiff::{Span, Timestamp, Zoned, civil::DateTime, tz::TimeZone};
 
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
@@ -114,16 +114,22 @@ mod tests {
         assert!(!TimeFilter::before("2min").unwrap().applies_to(&t1m_ago));
 
         let t10s_before = "2010-10-10 10:10:00";
-        assert!(!TimeFilter::before(t10s_before)
-            .unwrap()
-            .applies_to(&ref_time));
-        assert!(TimeFilter::before(t10s_before)
-            .unwrap()
-            .applies_to(&t1m_ago));
-
-        assert!(TimeFilter::after(t10s_before)
-            .unwrap()
-            .applies_to(&ref_time));
+        assert!(
+            !TimeFilter::before(t10s_before)
+                .unwrap()
+                .applies_to(&ref_time)
+        );
+        assert!(
+            TimeFilter::before(t10s_before)
+                .unwrap()
+                .applies_to(&t1m_ago)
+        );
+
+        assert!(
+            TimeFilter::after(t10s_before)
+                .unwrap()
+                .applies_to(&ref_time)
+        );
         assert!(!TimeFilter::after(t10s_before).unwrap().applies_to(&t1m_ago));
 
         let same_day = "2010-10-10";
@@ -142,16 +148,22 @@ mod tests {
         ref_time = test_time.timestamp();
         let t1m_ago = ref_time - Duration::from_secs(60);
         let t10s_before = "2010-10-10T10:10:00+00:00";
-        assert!(!TimeFilter::before(t10s_before)
-            .unwrap()
-            .applies_to(&ref_time));
-        assert!(TimeFilter::before(t10s_before)
-            .unwrap()
-            .applies_to(&t1m_ago));
-
-        assert!(TimeFilter::after(t10s_before)
-            .unwrap()
-            .applies_to(&ref_time));
+        assert!(
+            !TimeFilter::before(t10s_before)
+                .unwrap()
+                .applies_to(&ref_time)
+        );
+        assert!(
+            TimeFilter::before(t10s_before)
+                .unwrap()
+                .applies_to(&t1m_ago)
+        );
+
+        assert!(
+            TimeFilter::after(t10s_before)
+                .unwrap()
+                .applies_to(&ref_time)
+        );
         assert!(!TimeFilter::after(t10s_before).unwrap().applies_to(&t1m_ago));
 
         let ref_timestamp = 1707723412u64; // Mon Feb 12 07:36:52 UTC 2024
@@ -166,17 +178,25 @@ mod tests {
         let t1s_later = ref_time + Duration::from_secs(1);
         // Timestamp only supported via '@' prefix
         assert!(TimeFilter::before(&ref_timestamp.to_string()).is_none());
-        assert!(TimeFilter::before(&format!("@{ref_timestamp}"))
-            .unwrap()
-            .applies_to(&t1m_ago));
-        assert!(!TimeFilter::before(&format!("@{ref_timestamp}"))
-            .unwrap()
-            .applies_to(&t1s_later));
-        assert!(!TimeFilter::after(&format!("@{ref_timestamp}"))
-            .unwrap()
-            .applies_to(&t1m_ago));
-        assert!(TimeFilter::after(&format!("@{ref_timestamp}"))
-            .unwrap()
-            .applies_to(&t1s_later));
+        assert!(
+            TimeFilter::before(&format!("@{ref_timestamp}"))
+                .unwrap()
+                .applies_to(&t1m_ago)
+        );
+        assert!(
+            !TimeFilter::before(&format!("@{ref_timestamp}"))
+                .unwrap()
+                .applies_to(&t1s_later)
+        );
+        assert!(
+            !TimeFilter::after(&format!("@{ref_timestamp}"))
+                .unwrap()
+                .applies_to(&t1m_ago)
+        );
+        assert!(
+            TimeFilter::after(&format!("@{ref_timestamp}"))
+                .unwrap()
+                .applies_to(&t1s_later)
+        );
     }
 }

src/filter/time.rs

@@ -131,7 +131,7 @@ impl FormatTemplate {
                         Placeholder => {
                             s.push(Self::replace_separator(path.as_ref(), path_separator))
                         }
-                        Text(ref string) => s.push(string),
+                        Text(string) => s.push(string),
                     }
                 }
                 s