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]>

Author: bors[bot]

.travis.yml

@@ -16,23 +16,23 @@ matrix:
   - rust: 1.28.0
     name: "crossbeam on 1.28.0"
     script: ./ci/crossbeam.sh
-  - rust: 1.26.0
-    name: "crossbeam-channel on 1.26.0"
+  - rust: 1.28.0
+    name: "crossbeam-channel on 1.28.0"
     script: ./ci/crossbeam-channel.sh
   - rust: 1.28.0
     name: "crossbeam-deque on 1.28.0"
     script: ./ci/crossbeam-deque.sh
-  - rust: 1.26.0
-    name: "crossbeam-epoch on 1.26.0"
+  - rust: 1.28.0
+    name: "crossbeam-epoch on 1.28.0"
     script: ./ci/crossbeam-epoch.sh
-  - rust: 1.26.0
-    name: "crossbeam-queue on 1.26.0"
+  - rust: 1.28.0
+    name: "crossbeam-queue on 1.28.0"
     script: ./ci/crossbeam-queue.sh
   - rust: 1.28.0
     name: "crossbeam-skiplist on 1.28.0"
     script: ./ci/crossbeam-skiplist.sh
-  - rust: 1.26.0
-    name: "crossbeam-utils on 1.26.0"
+  - rust: 1.28.0
+    name: "crossbeam-utils on 1.28.0"
     script: ./ci/crossbeam-utils.sh
 
   # Test crates on nightly Rust.
@@ -90,3 +90,11 @@ matrix:
   - rust: stable
     name: "rustfmt"
     script: ./ci/rustfmt.sh
+
+before_script:
+  # cfg-if 0.1.10 requires Rust 1.31+ so downgrade it.
+  - |
+    if [[ "$TRAVIS_RUST_VERSION" == "1.28.0" ]]; then
+      cargo generate-lockfile
+      cargo update -p cfg-if --precise 0.1.9
+    fi

ci/crossbeam-channel.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-channel
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --bins --examples --tests
 cargo test -- --test-threads=1

ci/crossbeam-deque.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-deque
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --bins --examples --tests
 cargo test

ci/crossbeam-epoch.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-epoch
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --no-default-features
 cargo check --bins --examples --tests

ci/crossbeam-queue.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-queue
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --bins --examples --tests
 cargo test

ci/crossbeam-skiplist.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-skiplist
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --no-default-features
 cargo check --bins --examples --tests

ci/crossbeam-utils.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/../crossbeam-utils
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --no-default-features
 cargo check --bins --examples --tests

ci/crossbeam.sh

@@ -3,9 +3,7 @@
 cd "$(dirname "$0")"/..
 set -ex
 
-if [[ "$TRAVIS_RUST_VERSION" != "nightly" ]]; then
-    export RUSTFLAGS="-D warnings"
-fi
+export RUSTFLAGS="-D warnings"
 
 cargo check --no-default-features
 cargo check --bins --examples --tests

crossbeam-channel/README.md

@@ -8,7 +8,7 @@ https://github.com/crossbeam-rs/crossbeam-channel)
 https://crates.io/crates/crossbeam-channel)
 [![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
 https://docs.rs/crossbeam-channel)
-[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
+[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
 https://www.rust-lang.org)
 [![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
 

crossbeam-channel/src/err.rs

@@ -132,7 +132,7 @@ impl<T: Send> error::Error for SendError<T> {
         "sending on a disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -183,7 +183,7 @@ impl<T: Send> error::Error for TrySendError<T> {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -254,7 +254,7 @@ impl<T: Send> error::Error for SendTimeoutError<T> {
         "sending on an empty and disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -317,7 +317,7 @@ impl error::Error for RecvError {
         "receiving on an empty and disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -339,7 +339,7 @@ impl error::Error for TryRecvError {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -387,7 +387,7 @@ impl error::Error for RecvTimeoutError {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -429,7 +429,7 @@ impl error::Error for TrySelectError {
         "all operations in select would block"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -445,7 +445,7 @@ impl error::Error for SelectTimeoutError {
         "timed out waiting on select"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }