From efdd9841f637a6acfefab0848e152df9ba58efcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?= <francois@garillot.net>
Date: Fri, 22 Dec 2023 09:05:59 -0500
Subject: [PATCH] ci: switch to dtolnay/rust-toolchain

---
 .github/workflows/bench_pr_comment.yml |  6 +++---
 .github/workflows/rust.yml             | 13 ++++++-------
 rust-toolchain                         |  1 -
 rust-toolchain.toml                    |  6 ++++++
 4 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 rust-toolchain
 create mode 100644 rust-toolchain.toml

diff --git a/.github/workflows/bench_pr_comment.yml b/.github/workflows/bench_pr_comment.yml
index 405985b4..ba1fd27f 100644
--- a/.github/workflows/bench_pr_comment.yml
+++ b/.github/workflows/bench_pr_comment.yml
@@ -53,7 +53,7 @@ jobs:
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
       # Set the Rust env vars
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - uses: boa-dev/criterion-compare-action@v3
         with:
@@ -80,7 +80,7 @@ jobs:
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
       # Set the Rust env vars
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - uses: boa-dev/criterion-compare-action@v3
         with:
@@ -107,7 +107,7 @@ jobs:
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
       # Set the Rust env vars
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - uses: boa-dev/criterion-compare-action@v3
         with:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 21c1ce98..b4ed7715 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -27,12 +27,13 @@ jobs:
       RUSTFLAGS: -D warnings
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Rust
-      uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@stable
     - uses: taiki-e/install-action@nextest
     - uses: Swatinem/rust-cache@v2
     - name: Check the minroot example compiles under the abomonate feature
-      run: cargo check --profile dev-ci --features "abomonate" --examples 
+      run: cargo check --profile dev-ci --features "abomonate" --examples
+    - name: Check benches compile under the flamegraph feature
+      run: cargo check --profile dev-ci --features "flamegraph" --benches
     - name: Build, with benches & examples
       run: cargo build --profile dev-ci --benches --examples 
     - name: Linux Tests in parallel, with nextest profile ci and cargo profile dev-ci
@@ -79,8 +80,8 @@ jobs:
     env:
       RUSTFLAGS: -D warnings
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
       - uses: Swatinem/rust-cache@v2
@@ -94,8 +95,6 @@ jobs:
           args: --all -- --check
       - name: Check clippy warnings
         run: cargo xclippy -D warnings
-      - name: Check benches compile under the flamegraph feature
-        run: cargo check --profile dev-ci --features "flamegraph" --benches
       - name: Doctests
         run: cargo test --doc --workspace
 
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index 22d6771a..00000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-1.72.1
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..1ffa70cc
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,6 @@
+[toolchain]
+# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
+profile = "default"
+channel = "1.73"
+targets = [ "wasm32-unknown-unknown" ]
+