From e51bb047f120f957462a4e16709599104687219a Mon Sep 17 00:00:00 2001
From: EdJoPaTo
 <rfc-conform-git-commit-email@funny-long-domain-label-everyone-hates-as-it-is-too-long.edjopato.de>
Date: Sun, 5 Feb 2023 13:02:02 +0100
Subject: [PATCH] ci(rust): improve workflow

---
 .github/workflows/coverage.yml | 16 +++++++-------
 .github/workflows/rust.yml     | 39 +++++++++++++++-------------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index cba5560..49af39a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -6,33 +6,33 @@ on:
 
 jobs:
   tarpaulin:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Setup Rust
         shell: bash -eux {0}
         run: |
-          rustup --version
-          rustup show
           rustup toolchain install stable --profile minimal
           rustup default stable
 
+      - name: Install cargo-tarpaulin
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-tarpaulin
+
       - uses: actions/checkout@v3
 
       - uses: actions/cache@v3
         with:
           key: tarpaulin-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: tarpaulin-
           path: |
-            ~/.cargo/bin/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
 
       - name: Run cargo-tarpaulin
-        uses: actions-rs/tarpaulin@v0.1
-        with:
-          args: --all-features
-          out-type: Html
+        run: cargo tarpaulin --all-features --out Html
 
       - name: Upload Report
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 089814a..156a474 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -9,13 +9,12 @@ on:
 
 jobs:
   rustfmt:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Setup Rust
         shell: bash -eux {0}
         run: |
-          rustup --version
-          rustup show
+          rm ~/.cargo/bin/{rustfmt,cargo-fmt}
           rustup toolchain install stable --profile minimal --component rustfmt
           rustup default stable
       - uses: actions/checkout@v3
@@ -31,9 +30,9 @@ jobs:
         toolchain:
           - stable
         os:
-          - ubuntu-22.04
-          - macos-12
-          - windows-2022
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
         clippyargs:
           - -D clippy::pedantic -D warnings
         features:
@@ -41,18 +40,18 @@ jobs:
         include:
           # Check future versions and maybe get some glances on soon to be lints
           - toolchain: beta
-            os: ubuntu-22.04
+            os: ubuntu-latest
             features: --all-features
             clippyargs: -W clippy::pedantic -W clippy::nursery -W clippy::cargo
           - toolchain: nightly
-            os: ubuntu-22.04
+            os: ubuntu-latest
             features: --all-features
             clippyargs: -W clippy::pedantic
 
           # Check the minimum supported Rust version (MSRV).
           # Sometimes old rust versions don't yet have the lints (allow unknown) or don't have fixes in lints (false positives -> don't error, just warn).
           # When a certain distro is a target look up its version: https://repology.org/project/rust/versions
-          - os: ubuntu-22.04
+          - os: ubuntu-latest
             toolchain: 1.56.1
             clippyargs: -A unknown-lints
             features: --all-features
@@ -60,8 +59,6 @@ jobs:
       - name: Setup Rust
         shell: bash -eux {0}
         run: |
-          rustup --version
-          rustup show
           rustup toolchain install ${{ matrix.toolchain }} --profile minimal --component clippy
           rustup default ${{ matrix.toolchain }}
 
@@ -100,31 +97,29 @@ jobs:
       matrix:
         include:
           - triple: x86_64-unknown-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-latest
           - triple: aarch64-unknown-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-latest
           - triple: armv7-unknown-linux-gnueabihf
-            os: ubuntu-22.04
+            os: ubuntu-latest
           - triple: arm-unknown-linux-gnueabihf
-            os: ubuntu-22.04
+            os: ubuntu-latest
           - triple: riscv64gc-unknown-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-latest
 
           - triple: x86_64-apple-darwin
-            os: macos-12
+            os: macos-latest
           - triple: aarch64-apple-darwin
-            os: macos-12
+            os: macos-latest
 
           - triple: x86_64-pc-windows-msvc
-            os: windows-2022
+            os: windows-latest
           - triple: aarch64-pc-windows-msvc
-            os: windows-2022
+            os: windows-latest
     steps:
       - name: Setup Rust
         shell: bash -eux {0}
         run: |
-          rustup --version
-          rustup show
           rustup toolchain install stable --profile minimal --target ${{ matrix.triple }}
           rustup default stable