Skip to content

Commit a5859f3

Browse files
bors[bot]taiki-e
bors[bot]
and
taiki-e
authored
Merge #428
428: Fix build failure on nightly and the minimum version 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 + 35dc824 commit a5859f3

File tree

29 files changed

+78
-81
lines changed

29 files changed

+78
-81
lines changed

‎.travis.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ matrix:
1616
- rust: 1.28.0
1717
name: "crossbeam on 1.28.0"
1818
script: ./ci/crossbeam.sh
19-
- rust: 1.26.0
20-
name: "crossbeam-channel on 1.26.0"
19+
- rust: 1.28.0
20+
name: "crossbeam-channel on 1.28.0"
2121
script: ./ci/crossbeam-channel.sh
2222
- rust: 1.28.0
2323
name: "crossbeam-deque on 1.28.0"
2424
script: ./ci/crossbeam-deque.sh
25-
- rust: 1.26.0
26-
name: "crossbeam-epoch on 1.26.0"
25+
- rust: 1.28.0
26+
name: "crossbeam-epoch on 1.28.0"
2727
script: ./ci/crossbeam-epoch.sh
28-
- rust: 1.26.0
29-
name: "crossbeam-queue on 1.26.0"
28+
- rust: 1.28.0
29+
name: "crossbeam-queue on 1.28.0"
3030
script: ./ci/crossbeam-queue.sh
3131
- rust: 1.28.0
3232
name: "crossbeam-skiplist on 1.28.0"
3333
script: ./ci/crossbeam-skiplist.sh
34-
- rust: 1.26.0
35-
name: "crossbeam-utils on 1.26.0"
34+
- rust: 1.28.0
35+
name: "crossbeam-utils on 1.28.0"
3636
script: ./ci/crossbeam-utils.sh
3737

3838
# Test crates on nightly Rust.
@@ -90,3 +90,11 @@ matrix:
9090
- rust: stable
9191
name: "rustfmt"
9292
script: ./ci/rustfmt.sh
93+
94+
before_script:
95+
# cfg-if 0.1.10 requires Rust 1.31+ so downgrade it.
96+
- |
97+
if [[ "$TRAVIS_RUST_VERSION" == "1.28.0" ]]; then
98+
cargo generate-lockfile
99+
cargo update -p cfg-if --precise 0.1.9
100+
fi

‎ci/crossbeam-channel.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-channel
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --bins --examples --tests
119
cargo test -- --test-threads=1

‎ci/crossbeam-deque.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-deque
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --bins --examples --tests
119
cargo test

‎ci/crossbeam-epoch.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-epoch
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --no-default-features
119
cargo check --bins --examples --tests

‎ci/crossbeam-queue.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-queue
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --bins --examples --tests
119
cargo test

‎ci/crossbeam-skiplist.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-skiplist
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --no-default-features
119
cargo check --bins --examples --tests

‎ci/crossbeam-utils.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/../crossbeam-utils
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --no-default-features
119
cargo check --bins --examples --tests

‎ci/crossbeam.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
cd "$(dirname "$0")"/..
44
set -ex
55

6-
if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
7-
export RUSTFLAGS="-D warnings"
8-
fi
6+
export RUSTFLAGS="-D warnings"
97

108
cargo check --no-default-features
119
cargo check --bins --examples --tests

‎crossbeam-channel/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-channel)
88
https://crates.io/crates/crossbeam-channel)
99
[![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
1010
https://docs.rs/crossbeam-channel)
11-
[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
11+
[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
1212
https://www.rust-lang.org)
1313
[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
1414

‎crossbeam-channel/src/err.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl<T: Send> error::Error for SendError<T> {
132132
"sending on a disconnected channel"
133133
}
134134

135-
fn cause(&self) -> Option<&error::Error> {
135+
fn cause(&self) -> Option<&dyn error::Error> {
136136
None
137137
}
138138
}
@@ -183,7 +183,7 @@ impl<T: Send> error::Error for TrySendError<T> {
183183
}
184184
}
185185

186-
fn cause(&self) -> Option<&error::Error> {
186+
fn cause(&self) -> Option<&dyn error::Error> {
187187
None
188188
}
189189
}
@@ -254,7 +254,7 @@ impl<T: Send> error::Error for SendTimeoutError<T> {
254254
"sending on an empty and disconnected channel"
255255
}
256256

257-
fn cause(&self) -> Option<&error::Error> {
257+
fn cause(&self) -> Option<&dyn error::Error> {
258258
None
259259
}
260260
}
@@ -317,7 +317,7 @@ impl error::Error for RecvError {
317317
"receiving on an empty and disconnected channel"
318318
}
319319

320-
fn cause(&self) -> Option<&error::Error> {
320+
fn cause(&self) -> Option<&dyn error::Error> {
321321
None
322322
}
323323
}
@@ -339,7 +339,7 @@ impl error::Error for TryRecvError {
339339
}
340340
}
341341

342-
fn cause(&self) -> Option<&error::Error> {
342+
fn cause(&self) -> Option<&dyn error::Error> {
343343
None
344344
}
345345
}
@@ -387,7 +387,7 @@ impl error::Error for RecvTimeoutError {
387387
}
388388
}
389389

390-
fn cause(&self) -> Option<&error::Error> {
390+
fn cause(&self) -> Option<&dyn error::Error> {
391391
None
392392
}
393393
}
@@ -429,7 +429,7 @@ impl error::Error for TrySelectError {
429429
"all operations in select would block"
430430
}
431431

432-
fn cause(&self) -> Option<&error::Error> {
432+
fn cause(&self) -> Option<&dyn error::Error> {
433433
None
434434
}
435435
}
@@ -445,7 +445,7 @@ impl error::Error for SelectTimeoutError {
445445
"timed out waiting on select"
446446
}
447447

448-
fn cause(&self) -> Option<&error::Error> {
448+
fn cause(&self) -> Option<&dyn error::Error> {
449449
None
450450
}
451451
}

0 commit comments

Comments
 (0)