From a1feeaf9941314edea23b8a8a6055ccc890ead01 Mon Sep 17 00:00:00 2001
From: Piotr Roslaniec <p.roslaniec@gmail.com>
Date: Mon, 22 Jan 2024 14:56:05 +0100
Subject: [PATCH 1/2] chore(ci): replace deprecated action-rs gh actions

---
 .github/workflows/umbral-pre.yml | 32 +++++++++++---------------------
 .github/workflows/wheels.yml     |  4 +---
 .github/workflows/workspace.yml  |  8 ++------
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/umbral-pre.yml b/.github/workflows/umbral-pre.yml
index d3b8b99..bb883e5 100644
--- a/.github/workflows/umbral-pre.yml
+++ b/.github/workflows/umbral-pre.yml
@@ -33,12 +33,10 @@ jobs:
           - wasm32-unknown-unknown
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       #- run: cp ../../Cargo.lock .. # Use same Cargo.lock resolution that's checked in
       - run: cargo build --features bindings-wasm --release --target ${{ matrix.target }}
 
@@ -53,12 +51,10 @@ jobs:
           - thumbv7em-none-eabi
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       #- run: cp ../../Cargo.lock .. # Use same Cargo.lock resolution that's checked in
       - run: cargo build --release --target ${{ matrix.target }} --no-default-features
 
@@ -71,7 +67,7 @@ jobs:
           - stable
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
@@ -89,12 +85,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: ${{ matrix.deps }}
       - run: cargo check --all-features
       - run: cargo test --release --all-features
@@ -113,12 +107,10 @@ jobs:
           python-version: ${{ matrix.python }}
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
 
       - name: Install umbral_pre package
         run: pip install -e .
@@ -153,12 +145,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          target: x86_64-unknown-linux-gnu
-          override: true
+          targets: x86_64-unknown-linux-gnu
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       # Only checking the coverage of the main library,
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 3fb71eb..144f20c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -22,11 +22,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          override: true
 
       - if: runner.os == 'Windows'
         run: |
diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
index efe1556..6962b65 100644
--- a/.github/workflows/workspace.yml
+++ b/.github/workflows/workspace.yml
@@ -21,12 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
         components: clippy
-        override: true
-        profile: minimal
     - run: cargo clippy --all --all-features --benches --tests -- -D warnings
 
   rustfmt:
@@ -36,12 +34,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: stable
           components: rustfmt
-          profile: minimal
-          override: true
 
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1

From f26eb43019218130e4ef1f7adf7454579f2b85b3 Mon Sep 17 00:00:00 2001
From: Piotr Roslaniec <p.roslaniec@gmail.com>
Date: Mon, 22 Jan 2024 15:10:30 +0100
Subject: [PATCH 2/2] fix(clippy): fallible conversion clippy check

---
 umbral-pre/src/bindings_python.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umbral-pre/src/bindings_python.rs b/umbral-pre/src/bindings_python.rs
index 2b3e186..e9f2921 100644
--- a/umbral-pre/src/bindings_python.rs
+++ b/umbral-pre/src/bindings_python.rs
@@ -59,7 +59,7 @@ fn hash(data: impl AsRef<[u8]>) -> i64 {
     // we just need something fast that minimizes conflicts.
     let digest = Sha256::new().chain(data).finalize();
     let (chunk, _): (GenericArray<u8, U8>, _) = digest.split();
-    let arr: [u8; 8] = chunk.try_into().unwrap();
+    let arr: [u8; 8] = chunk.into();
     i64::from_be_bytes(arr)
 }