From 4858032bf088b201efe96485fffa7b7c59aa942f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 13:44:08 -0600 Subject: [PATCH 1/3] chore: Bump MSRV to 1.85 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3bcc141..64fcd27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" repository = "https://github.com/assert-rs/dir-diff.git" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.69" # MSRV +rust-version = "1.85" # MSRV include = [ "build.rs", "src/**/*", From d5bdf7be92bc3500ecb400f1489667dcd638567c Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 13:44:36 -0600 Subject: [PATCH 2/3] style: Make clippy happy --- src/lib.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index bbbcffb..55998f6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -112,13 +112,8 @@ mod tests { #[test] fn test_display() { - use std::io::ErrorKind; - assert_eq!( - format!( - "{}", - Error::Io(std::io::Error::new(ErrorKind::Other, "oh no!")) - ), + format!("{}", Error::Io(std::io::Error::other("oh no!"))), "I/O error: oh no!" ); } From 5906731271c6425edbd3f2a20ff50abc6572e92f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 13:45:25 -0600 Subject: [PATCH 3/3] chore: Migrate to Edition 2024 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 64fcd27..4d860ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] -resolver = "2" +resolver = "3" [workspace.package] repository = "https://github.com/assert-rs/dir-diff.git" license = "MIT OR Apache-2.0" -edition = "2021" +edition = "2024" rust-version = "1.85" # MSRV include = [ "build.rs",