diff options
| author | bors <bors@rust-lang.org> | 2022-09-25 07:47:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-25 07:47:42 +0000 |
| commit | e8683f50fb11779bd5d748255f0994627fbe5a71 (patch) | |
| tree | caa2866c1a6b88e3b5fb4c490f1d094d2a94907f | |
| parent | e0982da03a6a78dac132cfa27f3c0f17570104c4 (diff) | |
| parent | 7e97f85fb7a29ca186610c1c5c2b59afed8b0cae (diff) | |
| download | rust-e8683f50fb11779bd5d748255f0994627fbe5a71.tar.gz rust-e8683f50fb11779bd5d748255f0994627fbe5a71.zip | |
Auto merge of #2567 - RalfJung:ci-sparse, r=RalfJung
CI: use cargo sparse registry CI spends a few minutes downloading the index so this could help.
| -rw-r--r-- | src/tools/miri/.github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | src/tools/miri/src/concurrency/thread.rs | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index 2d26e33545c..b62625802f5 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 }} @@ -61,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 diff --git a/src/tools/miri/src/concurrency/thread.rs b/src/tools/miri/src/concurrency/thread.rs index 0788c05be7a..a9d144eff54 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"); } |