Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.8: Prepare for the next release #1050

Merged
merged 25 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
efea54e
Always use load(Acquire) for load_consume on Miri/TSan
taiki-e Jun 17, 2023
96e4575
ci: Use armv5te instead of mips to test target that does not have 64-…
taiki-e Jul 16, 2023
064bc05
Fix clippy::incorrect_clone_impl_on_copy_type warning
taiki-e Jul 16, 2023
5074976
Update loom to 0.6
taiki-e Jul 16, 2023
8f585d6
Always use load(Acquire) for load_consume on loom
taiki-e Jul 16, 2023
d8c4d5b
Remove timing assumptions from `wait_and_drop` test (#1005)
Darksonn Jul 27, 2023
9fc2cf1
Fix noop_method_call warning in doctest
taiki-e Aug 5, 2023
a076656
Update loom to 0.7
taiki-e Aug 9, 2023
76f608c
CachePadded: update alignment for mips32r6 and mips64r6
taiki-e Aug 11, 2023
cfe9011
Update actions/checkout action to v4
taiki-e Dec 13, 2023
8bdd4ea
CachePadded: Use 64-byte alignment on riscv32 and riscv64
taiki-e Sep 10, 2023
006cffc
epoch: Fix false sharing in Local struct (#1026)
linericyang Sep 12, 2023
c45570e
Update loom to 0.7.1
taiki-e Oct 2, 2023
dddb62f
Bump MSRV to Rust 1.61
taiki-e Nov 5, 2023
00fddfd
Remove build scripts from most crates and clean up no_atomic handling
taiki-e Nov 5, 2023
5096ddf
Resolve some MSRV-related TODOs
taiki-e Nov 5, 2023
5ded632
AtomicCell: use atomic! macro in the impl_arithmetic!
taiki-e Nov 5, 2023
17b8644
AtomicCell: Use fetch_{min,max}
taiki-e Nov 5, 2023
e990ee0
epoch: Fix build error with loom
taiki-e Dec 13, 2023
2ffa481
AtomicCell: Always implement {,Ref}UnwindSafe
taiki-e Dec 2, 2023
4df330b
Catch panics in critical section of thread::scope
taiki-e Dec 2, 2023
b1e99ec
Remove dependency on scopeguard
taiki-e Dec 2, 2023
b0d3521
ci: Use stable rustc for codegen
taiki-e Dec 13, 2023
4657e6e
Fix get_unchecked UB by raw pointer calculation
sticnarf Dec 15, 2022
9449d67
Prepare for the next release
taiki-e Dec 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
fail-fast: false
matrix:
include:
- rust: '1.38'
- rust: '1.61'
os: ubuntu-latest
- rust: '1.38'
- rust: '1.61'
os: windows-latest
- rust: stable
os: ubuntu-latest
Expand All @@ -54,10 +54,10 @@ jobs:
# Test 32-bit target that does not have AtomicU64/AtomicI64.
- rust: nightly
os: ubuntu-latest
target: mips-unknown-linux-gnu
target: armv5te-unknown-linux-gnueabi
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
# --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
Expand All @@ -75,11 +75,11 @@ jobs:
fail-fast: false
matrix:
rust:
- '1.38'
- '1.61'
- nightly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
- name: Install cargo-hack
Expand All @@ -91,7 +91,7 @@ jobs:
dependencies:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly && rustup default nightly
- name: Install cargo-hack
Expand All @@ -108,9 +108,9 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly && rustup default nightly
run: rustup update stable
- run: ci/no_atomic.sh
- run: git add -N . && git diff --exit-code
if: github.repository_owner != 'crossbeam-rs' || github.event_name != 'schedule'
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update stable
- name: rustfmt
Expand All @@ -153,7 +153,7 @@ jobs:
# clippy:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - name: Install Rust
# run: rustup update stable
# - name: clippy
Expand All @@ -163,7 +163,7 @@ jobs:
miri:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup toolchain install nightly --component miri && rustup default nightly
- name: miri
Expand All @@ -173,7 +173,7 @@ jobs:
san:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly && rustup default nightly
- name: Run sanitizers
Expand All @@ -183,7 +183,7 @@ jobs:
loom:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update stable
- name: loom
Expand All @@ -193,7 +193,7 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly && rustup default nightly
- name: docs
Expand All @@ -202,7 +202,7 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install shellcheck
uses: taiki-e/install-action@shellcheck
- run: shellcheck $(git ls-files '*.sh')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
if: github.repository_owner == 'crossbeam-rs'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: taiki-e/create-gh-release-action@v1
with:
prefix: crossbeam(-[a-z]+)?
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "crossbeam"
# - Create "crossbeam-X.Y.Z" git tag
version = "0.8.2"
edition = "2018"
rust-version = "1.38"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
repository = "https://github.com/crossbeam-rs/crossbeam"
homepage = "https://github.com/crossbeam-rs/crossbeam"
Expand Down Expand Up @@ -44,31 +44,31 @@ nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly", "crossbeam-queu
cfg-if = "1"

[dependencies.crossbeam-channel]
version = "0.5"
version = "0.5.9"
path = "./crossbeam-channel"
default-features = false
optional = true

[dependencies.crossbeam-deque]
version = "0.8"
version = "0.8.4"
path = "./crossbeam-deque"
default-features = false
optional = true

[dependencies.crossbeam-epoch]
version = "0.9.5"
version = "0.9.16"
path = "./crossbeam-epoch"
default-features = false
optional = true

[dependencies.crossbeam-queue]
version = "0.3.2"
version = "0.3.9"
path = "./crossbeam-queue"
default-features = false
optional = true

[dependencies.crossbeam-utils]
version = "0.8.5"
version = "0.8.17"
path = "./crossbeam-utils"
default-features = false

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam#license)
https://crates.io/crates/crossbeam)
[![Documentation](https://docs.rs/crossbeam/badge.svg)](
https://docs.rs/crossbeam)
[![Rust 1.38+](https://img.shields.io/badge/rust-1.38+-lightgray.svg)](
[![Rust 1.61+](https://img.shields.io/badge/rust-1.61+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)

Expand Down Expand Up @@ -94,7 +94,7 @@ crossbeam = "0.8"

Crossbeam supports stable Rust releases going back at least six months,
and every time the minimum supported Rust version is increased, a new minor
version is released. Currently, the minimum supported Rust version is 1.38.
version is released. Currently, the minimum supported Rust version is 1.61.

## Contributing

Expand Down
38 changes: 8 additions & 30 deletions ci/no_atomic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,26 @@ cd "$(dirname "$0")"/..

file="no_atomic.rs"

no_atomic_cas=()
no_atomic_64=()
no_atomic=()
for target in $(rustc --print target-list); do
target_spec=$(rustc --print target-spec-json -Z unstable-options --target "${target}")
for target_spec in $(RUSTC_BOOTSTRAP=1 rustc +stable -Z unstable-options --print all-target-specs-json | jq -c '. | to_entries | .[]'); do
target=$(jq <<<"${target_spec}" -r '.key')
target_spec=$(jq <<<"${target_spec}" -c '.value')
res=$(jq <<<"${target_spec}" -r 'select(."atomic-cas" == false)')
[[ -z "${res}" ]] || no_atomic_cas+=("${target}")
max_atomic_width=$(jq <<<"${target_spec}" -r '."max-atomic-width"')
min_atomic_width=$(jq <<<"${target_spec}" -r '."min-atomic-width"')
case "${max_atomic_width}" in
# `"max-atomic-width" == 0` means that atomic is not supported at all.
# We do not have a cfg for targets with {8,16}-bit atomic only, so
# for now we treat them the same as targets that do not support atomic.
0) no_atomic+=("${target}") ;;
# It is not clear exactly what `"max-atomic-width" == null` means, but they
# actually seem to have the same max-atomic-width as the target-pointer-width.
# The targets currently included in this group are "mipsel-sony-psp",
# "thumbv4t-none-eabi", "thumbv6m-none-eabi", all of which are
# `"target-pointer-width" == "32"`, so assuming them `"max-atomic-width" == 32`
# for now.
32 | null) no_atomic_64+=("${target}") ;;
# `"max-atomic-width" == 0` means that atomic is not supported at all.
0)
no_atomic_64+=("${target}")
no_atomic+=("${target}")
;;
64 | 128) ;;
# There is no `"max-atomic-width" == 16` or `"max-atomic-width" == 8` targets.
null | 8 | 16 | 32 | 64 | 128) ;;
*) exit 1 ;;
esac
case "${min_atomic_width}" in
Expand All @@ -46,24 +42,6 @@ cat >"${file}" <<EOF
// This file is @generated by $(basename "$0").
// It is not intended for manual editing.

const NO_ATOMIC_CAS: &[&str] = &[
EOF
for target in "${no_atomic_cas[@]}"; do
echo " \"${target}\"," >>"${file}"
done
cat >>"${file}" <<EOF
];

#[allow(dead_code)] // Only crossbeam-utils uses this.
const NO_ATOMIC_64: &[&str] = &[
EOF
for target in "${no_atomic_64[@]}"; do
echo " \"${target}\"," >>"${file}"
done
cat >>"${file}" <<EOF
];

#[allow(dead_code)] // Only crossbeam-utils uses this.
const NO_ATOMIC: &[&str] = &[
EOF
for target in "${no_atomic[@]}"; do
Expand Down
4 changes: 4 additions & 0 deletions crossbeam-channel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Version 0.5.9

- Bump the minimum supported Rust version to 1.61. (#1037)

# Version 0.5.8

- Fix race condition in unbounded channel. (#972)
Expand Down
6 changes: 3 additions & 3 deletions crossbeam-channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name = "crossbeam-channel"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-channel-X.Y.Z" git tag
version = "0.5.8"
version = "0.5.9"
edition = "2018"
rust-version = "1.38"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
repository = "https://github.com/crossbeam-rs/crossbeam"
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
Expand All @@ -27,7 +27,7 @@ std = ["crossbeam-utils/std"]
cfg-if = "1"

[dependencies.crossbeam-utils]
version = "0.8"
version = "0.8.17"
path = "../crossbeam-utils"
default-features = false
optional = true
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-channel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel#license)
https://crates.io/crates/crossbeam-channel)
[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
https://docs.rs/crossbeam-channel)
[![Rust 1.38+](https://img.shields.io/badge/rust-1.38+-lightgray.svg)](
[![Rust 1.61+](https://img.shields.io/badge/rust-1.61+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)

Expand Down Expand Up @@ -48,7 +48,7 @@ crossbeam-channel = "0.5"

Crossbeam Channel supports stable Rust releases going back at least six months,
and every time the minimum supported Rust version is increased, a new minor
version is released. Currently, the minimum supported Rust version is 1.38.
version is released. Currently, the minimum supported Rust version is 1.61.

## License

Expand Down
4 changes: 4 additions & 0 deletions crossbeam-deque/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Version 0.8.4

- Bump the minimum supported Rust version to 1.61. (#1037)

# Version 0.8.3

- Add `Stealer::{steal_batch_with_limit, steal_batch_with_limit_and_pop}` methods. (#903)
Expand Down
8 changes: 4 additions & 4 deletions crossbeam-deque/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name = "crossbeam-deque"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-deque-X.Y.Z" git tag
version = "0.8.3"
version = "0.8.4"
edition = "2018"
rust-version = "1.38"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
repository = "https://github.com/crossbeam-rs/crossbeam"
homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque"
Expand All @@ -27,13 +27,13 @@ std = ["crossbeam-epoch/std", "crossbeam-utils/std"]
cfg-if = "1"

[dependencies.crossbeam-epoch]
version = "0.9"
version = "0.9.16"
path = "../crossbeam-epoch"
default-features = false
optional = true

[dependencies.crossbeam-utils]
version = "0.8"
version = "0.8.17"
path = "../crossbeam-utils"
default-features = false
optional = true
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-deque/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-deque#license)
https://crates.io/crates/crossbeam-deque)
[![Documentation](https://docs.rs/crossbeam-deque/badge.svg)](
https://docs.rs/crossbeam-deque)
[![Rust 1.38+](https://img.shields.io/badge/rust-1.38+-lightgray.svg)](
[![Rust 1.61+](https://img.shields.io/badge/rust-1.61+-lightgray.svg)](
https://www.rust-lang.org)
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)

Expand All @@ -28,7 +28,7 @@ crossbeam-deque = "0.8"

Crossbeam Deque supports stable Rust releases going back at least six months,
and every time the minimum supported Rust version is increased, a new minor
version is released. Currently, the minimum supported Rust version is 1.38.
version is released. Currently, the minimum supported Rust version is 1.61.

## License

Expand Down
5 changes: 1 addition & 4 deletions crossbeam-deque/src/deque.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ impl<T> Buffer<T> {

impl<T> Clone for Buffer<T> {
fn clone(&self) -> Buffer<T> {
Buffer {
ptr: self.ptr,
cap: self.cap,
}
*self
}
}

Expand Down
8 changes: 8 additions & 0 deletions crossbeam-epoch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Version 0.9.16

- Bump the minimum supported Rust version to 1.61. (#1037)
- Improve support for targets without atomic CAS. (#1037)
- Remove build script. (#1037)
- Remove dependency on `scopeguard`. (#1045)
- Update `loom` dependency to 0.7.

# Version 0.9.15

- Update `memoffset` to 0.9. (#981)
Expand Down
Loading