Skip to content

Commit aeb311d

Browse files
bors[bot]taiki-e
andauthored
Merge #428
428: Fix breakage with nightly feature r=jeehoonkang a=taiki-e `target_has_atomic = "cas"` was removed in rust-lang/rust#65214. Fixes rust-lang/rust#65424 Fixes #412 Co-authored-by: Taiki Endo <[email protected]>
2 parents ae148de + 4dce6d7 commit aeb311d

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,31 @@ matrix:
1616
- rust: 1.28.0
1717
name: "crossbeam on 1.28.0"
1818
script: ./ci/crossbeam.sh
19+
before_script: ./ci/downgrade-dependencies.sh
1920
- rust: 1.26.0
2021
name: "crossbeam-channel on 1.26.0"
2122
script: ./ci/crossbeam-channel.sh
23+
before_script: ./ci/downgrade-dependencies.sh
2224
- rust: 1.28.0
2325
name: "crossbeam-deque on 1.28.0"
2426
script: ./ci/crossbeam-deque.sh
27+
before_script: ./ci/downgrade-dependencies.sh
2528
- rust: 1.26.0
2629
name: "crossbeam-epoch on 1.26.0"
2730
script: ./ci/crossbeam-epoch.sh
31+
before_script: ./ci/downgrade-dependencies.sh
2832
- rust: 1.26.0
2933
name: "crossbeam-queue on 1.26.0"
3034
script: ./ci/crossbeam-queue.sh
35+
before_script: ./ci/downgrade-dependencies.sh
3136
- rust: 1.28.0
3237
name: "crossbeam-skiplist on 1.28.0"
3338
script: ./ci/crossbeam-skiplist.sh
39+
before_script: ./ci/downgrade-dependencies.sh
3440
- rust: 1.26.0
3541
name: "crossbeam-utils on 1.26.0"
3642
script: ./ci/crossbeam-utils.sh
43+
before_script: ./ci/downgrade-dependencies.sh
3744

3845
# Test crates on nightly Rust.
3946
- rust: nightly

ci/downgrade-dependencies.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# lazy_static 1.4 requires Rust 1.27+
2+
# and cfg-if 1.10 requires Rust 1.31+ so downgrade it.
3+
- cargo generate-lockfile
4+
- cargo update -p cfg-if --precise 1.9
5+
- cargo update -p lazy_static --precise 1.3

crossbeam-epoch/src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@ cfg_if! {
7373
}
7474
}
7575

76-
#[cfg_attr(
77-
feature = "nightly",
78-
cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
79-
)]
76+
#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
8077
cfg_if! {
8178
if #[cfg(any(feature = "alloc", feature = "std"))] {
8279
extern crate crossbeam_utils;

crossbeam-skiplist/src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ cfg_if! {
1818
}
1919
}
2020

21-
#[cfg_attr(
22-
feature = "nightly",
23-
cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
24-
)]
21+
#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
2522
cfg_if! {
2623
if #[cfg(any(feature = "alloc", feature = "std"))] {
2724
extern crate crossbeam_epoch as epoch;

crossbeam-utils/src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ cfg_if! {
4444
}
4545
}
4646

47-
#[cfg_attr(
48-
feature = "nightly",
49-
cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
50-
)]
47+
#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
5148
pub mod atomic;
5249

5350
mod cache_padded;

src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,7 @@ pub use _epoch::crossbeam_epoch as epoch;
6868

6969
extern crate crossbeam_utils;
7070

71-
#[cfg_attr(
72-
feature = "nightly",
73-
cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
74-
)]
71+
#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
7572
pub use crossbeam_utils::atomic;
7673

7774
/// Miscellaneous utilities.

0 commit comments

Comments
 (0)