From 511ba3d86e37a6f733df352fc3c323f3a3686542 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Mon, 31 Jul 2023 10:29:57 +0200
Subject: [PATCH] Make nightly toolchain used for CI the default

---
 .github/workflows/ci.yml | 8 +++++---
 rust-toolchain.toml      | 3 ++-
 xtask/src/ci.rs          | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62e8aca7..cd1e6499 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,8 @@ name: CI
 env:
   CARGO_TERM_COLOR: always
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
+  # Keep in sync with version in `rust-toolchain.toml` and `xtask/src/ci.rs`
+  NIGHTLY: nightly-2023-07-03
 
 on:
   push:
@@ -43,7 +45,7 @@ jobs:
       - name: Install rust nightly toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-07-03
+          toolchain: ${{ env.NIGHTLY }}
 
       - uses: Swatinem/rust-cache@v2
 
@@ -186,7 +188,7 @@ jobs:
       - name: Install rust nightly toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-07-03
+          toolchain: ${{ env.NIGHTLY }}
           components: ${{ matrix.components }}
 
       - uses: Swatinem/rust-cache@v2
@@ -218,7 +220,7 @@ jobs:
         # Nightly needed for use of unstable options
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-07-03
+          toolchain: ${{ env.NIGHTLY }}
 
       - uses: Swatinem/rust-cache@v2
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 8e275b74..1ba4931b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,4 @@
 [toolchain]
-channel = "nightly"
+# Keep in sync with version in `xtask/src/ci.rs` and `.github/workflows/ci.yml`
+channel = "nightly-2023-07-03"
 components = ["rustfmt", "clippy"]
diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs
index 6480cd68..16031c49 100644
--- a/xtask/src/ci.rs
+++ b/xtask/src/ci.rs
@@ -13,6 +13,7 @@ mod spec_links;
 use spec_links::check_spec_links;
 
 const MSRV: &str = "1.65";
+// Keep in sync with version in `rust-toolchain.toml` and `.github/workflows/ci.yml`
 const NIGHTLY: &str = "nightly-2023-07-03";
 
 #[derive(Args)]