Skip to content

Commit

Permalink
Merge #850
Browse files Browse the repository at this point in the history
850: Prepare for the next release r=taiki-e a=taiki-e

- crossbeam-channel 0.5.4 -> 0.5.5
  - Replace Spinlock with Mutex. (#835)
- crossbeam-epoch 0.9.8 -> 0.9.9
  - Replace lazy_static with once_cell. (#817)
- crossbeam-utils 0.8.8 -> 0.8.9
  - Replace lazy_static with once_cell. (#817)

Co-authored-by: Taiki Endo <te316e89@gmail.com>
  • Loading branch information
bors[bot] and taiki-e committed Jun 16, 2022
2 parents 657eef1 + a152576 commit 982355f
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 8 deletions.
15 changes: 10 additions & 5 deletions ci/miri.sh
Expand Up @@ -5,30 +5,35 @@ cd "$(dirname "$0")"/..

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

MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation" \
# TODO: remove -Zmiri-disable-weak-memory-emulation once https://github.com/rust-lang/miri/issues/2223 fixed.
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation" \
cargo miri test \
-p crossbeam-queue \
-p crossbeam-utils

# -Zmiri-ignore-leaks is needed because we use detached threads in tests/docs: https://github.com/rust-lang/miri/issues/1371
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
# TODO: remove -Zmiri-disable-weak-memory-emulation once https://github.com/rust-lang/miri/issues/2223 fixed.
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-ignore-leaks" \
cargo miri test \
-p crossbeam-channel

# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks" \
# TODO: remove -Zmiri-disable-weak-memory-emulation once https://github.com/rust-lang/miri/issues/2223 fixed.
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows -Zmiri-disable-weak-memory-emulation -Zmiri-ignore-leaks" \
cargo miri test \
-p crossbeam-epoch \
-p crossbeam-skiplist

# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks -Zmiri-compare-exchange-weak-failure-rate=0.0" \
# TODO: remove -Zmiri-disable-weak-memory-emulation once https://github.com/rust-lang/miri/issues/2223 fixed.
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-weak-memory-emulation -Zmiri-ignore-leaks -Zmiri-compare-exchange-weak-failure-rate=0.0" \
cargo miri test \
-p crossbeam-deque

# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-ignore-leaks" \
# TODO: remove -Zmiri-disable-weak-memory-emulation once https://github.com/rust-lang/miri/issues/2223 fixed.
MIRIFLAGS="-Zmiri-check-number-validity -Zmiri-symbolic-alignment-check -Zmiri-disable-weak-memory-emulation -Zmiri-ignore-leaks" \
cargo miri test \
-p crossbeam
4 changes: 4 additions & 0 deletions crossbeam-channel/CHANGELOG.md
@@ -1,3 +1,7 @@
# Version 0.5.5

- Replace Spinlock with Mutex. (#835)

# Version 0.5.4

- Workaround a bug in upstream related to TLS access on AArch64 Linux. (#802)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-channel/Cargo.toml
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-channel"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-channel-X.Y.Z" git tag
version = "0.5.4"
version = "0.5.5"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 4 additions & 0 deletions crossbeam-epoch/CHANGELOG.md
@@ -1,3 +1,7 @@
# Version 0.9.9

- Replace lazy_static with once_cell. (#817)

# Version 0.9.8

- Make `Atomic::null()` const function at 1.61+. (#797)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-epoch"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-epoch-X.Y.Z" git tag
version = "0.9.8"
version = "0.9.9"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down
4 changes: 4 additions & 0 deletions crossbeam-utils/CHANGELOG.md
@@ -1,3 +1,7 @@
# Version 0.8.9

- Replace lazy_static with once_cell. (#817)

# Version 0.8.8

- Fix a bug when unstable `loom` support is enabled. (#787)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-utils"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-utils-X.Y.Z" git tag
version = "0.8.8"
version = "0.8.9"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
Expand Down

0 comments on commit 982355f

Please sign in to comment.