From 41728e3b52201ed8bd434778023c93486126968e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 14:03:26 -0600 Subject: [PATCH 1/2] 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 115befa..1c05e63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" repository = "https://github.com/gitext-rs/git2-ext.git" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.80" # MSRV +rust-version = "1.85" # MSRV include = [ "build.rs", "src/**/*", From 8ea73312c79ecaf1dd106f5254b6b19abf699da7 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 2 Mar 2026 14:04:00 -0600 Subject: [PATCH 2/2] chore: Migrate to Edition 2024 --- Cargo.toml | 4 ++-- src/ops.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1c05e63..3fbc44b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] -resolver = "2" +resolver = "3" [workspace.package] repository = "https://github.com/gitext-rs/git2-ext.git" license = "MIT OR Apache-2.0" -edition = "2021" +edition = "2024" rust-version = "1.85" # MSRV include = [ "build.rs", diff --git a/src/ops.rs b/src/ops.rs index d1ea984..9d259c6 100644 --- a/src/ops.rs +++ b/src/ops.rs @@ -517,10 +517,10 @@ impl Sign for SshSign { if !output.status.success() { if output.stderr.find("usage:").is_some() { return Err(git2::Error::new( - git2::ErrorCode::GenericError, - git2::ErrorClass::Os, - "ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)" - )); + git2::ErrorCode::GenericError, + git2::ErrorClass::Os, + "ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)", + )); } else { return Err(git2::Error::new( git2::ErrorCode::GenericError,