chore: Bump MSRV to 1.65.0

Author: epage

.clippy.toml

@@ -1 +1 @@
-msrv = "1.61.0"  # MSRV
+msrv = "1.65.0"  # MSRV

.github/workflows/ci.yml

@@ -60,15 +60,15 @@ jobs:
     - name: No-default features
       run: cargo test --workspace --no-default-features
   msrv:
-    name: "Check MSRV: 1.61.0"
+    name: "Check MSRV: 1.65.0"
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.61.0  # MSRV
+        toolchain: 1.65.0  # MSRV
         profile: minimal
         override: true
     - uses: Swatinem/rust-cache@v2
@@ -122,7 +122,7 @@ jobs:
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.61.0  # MSRV
+        toolchain: 1.65.0  # MSRV
         profile: minimal
         override: true
         components: clippy

.github/workflows/rust-next.yml

@@ -71,9 +71,9 @@ jobs:
     strategy:
       matrix:
         rust:
-        - 1.61.0  # MSRV
+        - 1.65.0  # MSRV
         - stable
-    continue-on-error: ${{ matrix.rust != '1.61.0' }}  # MSRV
+    continue-on-error: ${{ matrix.rust != '1.65.0' }}  # MSRV
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository

Cargo.lock

@@ -10,7 +10,7 @@ readme = "README.md"
 categories = ["command-line-interface"]
 keywords = ["git"]
 edition = "2021"
-rust-version = "1.61.0"  # MSRV
+rust-version = "1.65.0"  # MSRV
 include = [
   "build.rs",
   "src/**/*",
@@ -38,7 +38,6 @@ which = "4"
 bstr = { version = "1.1.0", default-features = false }
 tempfile = "3.3.0"
 shlex = "1.1.0"
-expanduser = "1.2.2"
 
 [dev-dependencies]
 git-fixture = { version = "0.3", features = ["yaml"] }

Cargo.toml

@@ -458,14 +458,13 @@ impl Sign for SshSign {
             literal_key_file = Some(temp);
             path
         } else {
+            fn expanduser(path: &str) -> std::path::PathBuf {
+                // HACK: Need a cross-platform solution
+                std::path::PathBuf::from(path)
+            }
+
             // We assume a file
-            expanduser::expanduser(&self.signing_key).map_err(|e| {
-                git2::Error::new(
-                    git2::ErrorCode::GenericError,
-                    git2::ErrorClass::Os,
-                    format!("failed looking up signing file {}: {}", self.signing_key, e),
-                )
-            })?
+            expanduser(&self.signing_key)
         };
 
         let buffer_file = tempfile::NamedTempFile::new().map_err(|e| {
@@ -506,7 +505,7 @@ impl Sign for SshSign {
                 return Err(git2::Error::new(
                 git2::ErrorCode::GenericError,
                 git2::ErrorClass::Os,
-                format!("ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)")
+                "ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)"
             ));
             } else {
                 return Err(git2::Error::new(

src/ops.rs

@@ -22,5 +22,5 @@ fn find_git_bash() -> Option<std::path::PathBuf> {
     let git_path = which::which("git.exe").ok()?;
     let git_dir = git_path.parent()?.parent()?;
     let git_bash = git_dir.join("bin").join("bash.exe");
-    git_bash.is_file().then(|| git_bash)
+    git_bash.is_file().then_some(git_bash)
 }