From 160e7a921ec65535efface2cf2b02319cf40a1fe Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 16 Jun 2022 22:24:06 +0900 Subject: [PATCH 1/2] Temporarily disable Miri weak memory emulation --- ci/miri.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/miri.sh b/ci/miri.sh index f4af1a797..8075849a0 100755 --- a/ci/miri.sh +++ b/ci/miri.sh @@ -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 From a15257680276786ca52af47d9cdeceac82585d6f Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 16 Jun 2022 22:29:43 +0900 Subject: [PATCH 2/2] Prepare for the next release - crossbeam-channel 0.5.4 -> 0.5.5 - crossbeam-epoch 0.9.8 -> 0.9.9 - crossbeam-utils 0.8.8 -> 0.8.9 --- crossbeam-channel/CHANGELOG.md | 4 ++++ crossbeam-channel/Cargo.toml | 2 +- crossbeam-epoch/CHANGELOG.md | 4 ++++ crossbeam-epoch/Cargo.toml | 2 +- crossbeam-utils/CHANGELOG.md | 4 ++++ crossbeam-utils/Cargo.toml | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/crossbeam-channel/CHANGELOG.md b/crossbeam-channel/CHANGELOG.md index 5ee19e9b4..2f627cf26 100644 --- a/crossbeam-channel/CHANGELOG.md +++ b/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) diff --git a/crossbeam-channel/Cargo.toml b/crossbeam-channel/Cargo.toml index 647bec394..344092c03 100644 --- a/crossbeam-channel/Cargo.toml +++ b/crossbeam-channel/Cargo.toml @@ -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" diff --git a/crossbeam-epoch/CHANGELOG.md b/crossbeam-epoch/CHANGELOG.md index 1dac1b3e4..2f70edba7 100644 --- a/crossbeam-epoch/CHANGELOG.md +++ b/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) diff --git a/crossbeam-epoch/Cargo.toml b/crossbeam-epoch/Cargo.toml index fe111e720..a7b2cc933 100644 --- a/crossbeam-epoch/Cargo.toml +++ b/crossbeam-epoch/Cargo.toml @@ -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" diff --git a/crossbeam-utils/CHANGELOG.md b/crossbeam-utils/CHANGELOG.md index 5aa350f1c..f2cbf55df 100644 --- a/crossbeam-utils/CHANGELOG.md +++ b/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) diff --git a/crossbeam-utils/Cargo.toml b/crossbeam-utils/Cargo.toml index 5b0849c1a..f91baaea9 100644 --- a/crossbeam-utils/Cargo.toml +++ b/crossbeam-utils/Cargo.toml @@ -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"