Skip to content

Commit e8683f5

Browse files
committed
Auto merge of rust-lang#2567 - RalfJung:ci-sparse, r=RalfJung
CI: use cargo sparse registry CI spends a few minutes downloading the index so this could help.
2 parents e0982da + 7e97f85 commit e8683f5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/tools/miri/.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
schedule:
1313
- cron: '5 15 * * *' # At 15:05 UTC every day.
1414

15+
env:
16+
CARGO_UNSTABLE_SPARSE_REGISTRY: 'true'
17+
1518
jobs:
1619
build:
1720
runs-on: ${{ matrix.os }}
@@ -61,8 +64,8 @@ jobs:
6164
if: ${{ steps.cache.outputs.cache-hit == 'false' }}
6265
shell: bash
6366
run: |
64-
cargo install rustup-toolchain-install-master
65-
cargo install xargo
67+
cargo install -f rustup-toolchain-install-master
68+
cargo install -f xargo
6669
6770
- name: Install "master" toolchain
6871
shell: bash

src/tools/miri/src/concurrency/thread.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ impl<'mir, 'tcx: 'mir> ThreadManager<'mir, 'tcx> {
386386
data_race: Option<&mut data_race::GlobalState>,
387387
) -> InterpResult<'tcx> {
388388
if self.threads[joined_thread_id].join_status == ThreadJoinStatus::Detached {
389+
// On Windows this corresponds to joining on a closed handle.
389390
throw_ub_format!("trying to join a detached thread");
390391
}
391392

0 commit comments

Comments
 (0)