From 75bbe38e53438d612de0d2ed3bc1b842153b0374 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 25 Sep 2022 09:41:44 +0200
Subject: [PATCH 1/3] CI: use cargo sparse registry

---
 src/tools/miri/.github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml
index 2d26e33545c1..c05352f23d67 100644
--- a/src/tools/miri/.github/workflows/ci.yml
+++ b/src/tools/miri/.github/workflows/ci.yml
@@ -12,6 +12,9 @@ on:
   schedule:
     - cron: '5 15 * * *' # At 15:05 UTC every day.
 
+env:
+  CARGO_UNSTABLE_SPARSE_REGISTRY: 'true'
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}

From 1f53be15e1413e8f1a03578ded0c3045e893fc6c Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 25 Sep 2022 09:44:09 +0200
Subject: [PATCH 2/3] clarify a comment

---
 src/tools/miri/src/concurrency/thread.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/miri/src/concurrency/thread.rs b/src/tools/miri/src/concurrency/thread.rs
index 0788c05be7a1..a9d144eff54a 100644
--- a/src/tools/miri/src/concurrency/thread.rs
+++ b/src/tools/miri/src/concurrency/thread.rs
@@ -386,6 +386,7 @@ impl<'mir, 'tcx: 'mir> ThreadManager<'mir, 'tcx> {
         data_race: Option<&mut data_race::GlobalState>,
     ) -> InterpResult<'tcx> {
         if self.threads[joined_thread_id].join_status == ThreadJoinStatus::Detached {
+            // On Windows this corresponds to joining on a closed handle.
             throw_ub_format!("trying to join a detached thread");
         }
 

From 7e97f85fb7a29ca186610c1c5c2b59afed8b0cae Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 25 Sep 2022 09:46:31 +0200
Subject: [PATCH 3/3] force-install tools on stale cache, to make sure we get
 the latest of all dependencies

---
 src/tools/miri/.github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml
index c05352f23d67..b62625802f5a 100644
--- a/src/tools/miri/.github/workflows/ci.yml
+++ b/src/tools/miri/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
         if: ${{ steps.cache.outputs.cache-hit == 'false' }}
         shell: bash
         run: |
-          cargo install rustup-toolchain-install-master
-          cargo install xargo
+          cargo install -f rustup-toolchain-install-master
+          cargo install -f xargo
 
       - name: Install "master" toolchain
         shell: bash