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

Sync with v0.8 branch #1051

Merged
merged 2 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
steps:
- 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
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ alloc = ["crossbeam-epoch/alloc", "crossbeam-queue/alloc"]
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
2 changes: 1 addition & 1 deletion ci/no_atomic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd "$(dirname "$0")"/..
file="no_atomic.rs"

no_atomic=()
for target_spec in $(rustc -Z unstable-options --print all-target-specs-json | jq -c '. | to_entries | .[]'); do
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)')
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
4 changes: 2 additions & 2 deletions crossbeam-channel/Cargo.toml
Original file line number Diff line number Diff line change
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.8"
version = "0.5.9"
edition = "2021"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
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: 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
6 changes: 3 additions & 3 deletions crossbeam-deque/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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 = "2021"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
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
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
4 changes: 2 additions & 2 deletions crossbeam-epoch/Cargo.toml
Original file line number Diff line number Diff line change
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.15"
version = "0.9.16"
edition = "2021"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -48,7 +48,7 @@ memoffset = "0.9"
loom-crate = { package = "loom", version = "0.7.1", optional = true }

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

Expand Down
6 changes: 6 additions & 0 deletions crossbeam-queue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Version 0.3.9

- Bump the minimum supported Rust version to 1.61. (#1037)
- Improve support for targets without atomic CAS. (#1037)
- Remove build script. (#1037)

# Version 0.3.8

- Fix build script bug introduced in 0.3.7. (#932)
Expand Down
4 changes: 2 additions & 2 deletions crossbeam-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name = "crossbeam-queue"
# - Update CHANGELOG.md
# - Update README.md
# - Create "crossbeam-queue-X.Y.Z" git tag
version = "0.3.8"
version = "0.3.9"
edition = "2021"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
Expand All @@ -31,7 +31,7 @@ alloc = []
cfg-if = "1"

[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 crossbeam-skiplist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ alloc = ["crossbeam-epoch/alloc"]
cfg-if = "1"

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

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

Expand Down
10 changes: 10 additions & 0 deletions crossbeam-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Version 0.8.17

- Bump the minimum supported Rust version to 1.61. (#1037)
- Improve support for targets without atomic CAS or 64-bit atomic. (#1037)
- Always implement `{,Ref}UnwindSafe` for AtomicCell. (#1045)
- Improve compatibility with Miri, TSan, and loom. (#995, #1003)
- Improve compatibility with unstable `oom=panic`. (#1045)
- Improve implementation of `CachePadded`. (#1014, #1025)
- Update `loom` dependency to 0.7.

# Version 0.8.16

- Improve implementation of `CachePadded`. (#967)
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Original file line number Diff line number Diff line change
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.16"
version = "0.8.17"
edition = "2021"
rust-version = "1.61"
license = "MIT OR Apache-2.0"
Expand Down
3 changes: 3 additions & 0 deletions no_atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ const NO_ATOMIC: &[&str] = &[
"bpfel-unknown-none",
"mipsel-sony-psx",
"msp430-none-elf",
"riscv32i-unknown-none-elf",
"riscv32im-unknown-none-elf",
"riscv32imc-unknown-none-elf",
];