Merge pull request #2217 from GitoxideLabs/copilot/update-msrv-to-rust-1-82

Update MSRV to Rust 1.82 and replace once_cell with std equivalents

Author: Byron

.github/workflows/ci.yml

@@ -187,6 +187,8 @@ jobs:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: Setup dependencies
         run: |
           sudo apt-get update
@@ -209,6 +211,8 @@ jobs:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - uses: extractions/setup-just@v3
       - name: Run journey tests
         run: just ci-journey-tests
@@ -235,6 +239,8 @@ jobs:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: cargo check default features
         if: startsWith(matrix.os, 'windows')
         run: cargo check --workspace --bins --examples
@@ -284,6 +290,8 @@ jobs:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - uses: taiki-e/install-action@v2
         with:
           tool: nextest
@@ -363,6 +371,8 @@ jobs:
       - name: Add Rust tools to path
         run: echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV"
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - uses: taiki-e/install-action@v2
         with:
           tool: nextest
@@ -387,6 +397,8 @@ jobs:
         with:
           targets: ${{ env.TARGET }}
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - uses: taiki-e/install-action@v2
         with:
           tool: nextest
@@ -473,6 +485,8 @@ jobs:
           rustup default stable
           rustup target add "$TARGET"
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: 'WASI only: crates without feature toggle'
         if: endsWith(matrix.target, '-wasi')
         run: |

.github/workflows/cron.yml

@@ -17,5 +17,7 @@ jobs:
         with:
           persist-credentials: false
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: stress
         run: make stress

Cargo.lock

@@ -8,7 +8,7 @@ authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
 version = "0.45.0"
-rust-version = "1.74"
+rust-version = "1.82"
 default-run = "gix"
 include = ["src/**/*", "/build.rs", "LICENSE-*", "README.md"]
 resolver = "2"
@@ -174,7 +174,6 @@ terminal_size = "0.4.2"
 # Avoid pre-compiled binaries, see https://github.com/serde-rs/serde/issues/2538 and https://github.com/serde-rs/serde/pull/2590
 serde_derive = ">=1.0.185"
 
-once_cell = "1.21.3"
 document-features = { version = "0.2.0", optional = true }
 [profile.dev.package]
 insta.opt-level = 3

Cargo.toml

@@ -9,7 +9,7 @@ repository = "https://github.com/GitoxideLabs/gitoxide"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 include = ["src/**/*", "LICENSE-*"]
-rust-version = "1.70"
+rust-version = "1.82"
 
 [lib]
 doctest = false

etc/msrv-badge.svg

@@ -110,7 +110,7 @@ pub(crate) mod write {
 
     impl From<Error> for std::io::Error {
         fn from(err: Error) -> Self {
-            std::io::Error::new(std::io::ErrorKind::Other, err)
+            std::io::Error::other(err)
         }
     }
 

gix-actor/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 description = "archive generation from of a worktree stream"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.82"
 include = ["src/**/*", "LICENSE-*"]
 
 [lib]

gix-actor/src/signature/mod.rs

@@ -160,8 +160,7 @@ where
                 opts.tree_prefix.as_ref(),
             )?;
         }
-        ar.finish()
-            .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+        ar.finish().map_err(std::io::Error::other)?;
     }
 
     Ok(())
@@ -179,25 +178,25 @@ fn append_zip_entry<W: std::io::Write + std::io::Seek>(
     let file_opts = zip::write::SimpleFileOptions::default()
         .compression_method(zip::CompressionMethod::Deflated)
         .compression_level(compression_level)
-        .large_file(entry.bytes_remaining().map_or(true, |len| len > u32::MAX as usize))
+        .large_file(entry.bytes_remaining().is_none_or(|len| len > u32::MAX as usize))
         .last_modified_time(mtime)
         .unix_permissions(if entry.mode.is_executable() { 0o755 } else { 0o644 });
     let path = add_prefix(entry.relative_path(), tree_prefix).into_owned();
     match entry.mode.kind() {
         gix_object::tree::EntryKind::Blob | gix_object::tree::EntryKind::BlobExecutable => {
             ar.start_file(path.to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
             std::io::copy(&mut entry, ar)?;
         }
         gix_object::tree::EntryKind::Tree | gix_object::tree::EntryKind::Commit => {
             ar.add_directory(path.to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
         }
         gix_object::tree::EntryKind::Link => {
             use bstr::ByteSlice;
             std::io::copy(&mut entry, buf)?;
             ar.add_symlink(path.to_string(), buf.as_bstr().to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
         }
     }
     Ok(())

gix-archive/Cargo.toml

@@ -9,7 +9,7 @@ description = "A crate of the gitoxide project dealing .gitattributes files"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 edition = "2021"
 include = ["src/**/*", "LICENSE-*"]
-rust-version = "1.70"
+rust-version = "1.82"
 
 [lib]
 doctest = false