Skip to content

Commit 46d0777

Browse files
committed
Apply patch to once_cell
1 parent b05e1e3 commit 46d0777

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,7 @@ members = [
8686
"crossbeam-skiplist",
8787
"crossbeam-utils",
8888
]
89+
90+
[patch.crates-io]
91+
# https://github.com/matklad/once_cell/pull/185
92+
once_cell = { git = "https://github.com/saethlin/once_cell.git", rev = "4aa5ac4aa30b9eed4a0848f3ad22a5eeb025760d" }

ci/miri.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,36 @@ echo
99

1010
export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"
1111

12-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation" \
12+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation" \
1313
cargo miri test \
1414
-p crossbeam-queue \
1515
-p crossbeam-utils 2>&1 | ts -i '%.s '
1616

1717
# -Zmiri-ignore-leaks is needed because we use detached threads in tests/docs: https://github.com/rust-lang/miri/issues/1371
18-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
18+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
1919
cargo miri test \
2020
-p crossbeam-channel 2>&1 | ts -i '%.s '
2121

2222
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
23-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows" \
23+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows" \
2424
cargo miri test \
2525
-p crossbeam-epoch 2>&1 | ts -i '%.s '
2626

2727
# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/614
2828
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
29-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks" \
29+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks" \
3030
cargo miri test \
3131
-p crossbeam-skiplist 2>&1 | ts -i '%.s '
3232

3333
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
3434
# -Zmiri-compare-exchange-weak-failure-rate=0.0 is needed because some sequential tests (e.g.,
3535
# doctest of Stealer::steal) incorrectly assume that sequential weak CAS will never fail.
3636
# -Zmiri-preemption-rate=0 is needed because this code technically has UB and Miri catches that.
37-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
37+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
3838
cargo miri test \
3939
-p crossbeam-deque 2>&1 | ts -i '%.s '
4040

4141
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
42-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows" \
42+
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows" \
4343
cargo miri test \
4444
-p crossbeam 2>&1 | ts -i '%.s '

0 commit comments

Comments
 (0)