From 5b5d727fcd2616b1f5314db03f4e6b96791a303d Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Tue, 15 Oct 2019 23:07:30 +0900
Subject: [PATCH] Fix breakage with nightly feature

---
 crossbeam-epoch/src/lib.rs    | 5 +----
 crossbeam-skiplist/src/lib.rs | 5 +----
 crossbeam-utils/src/lib.rs    | 5 +----
 src/lib.rs                    | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/crossbeam-epoch/src/lib.rs b/crossbeam-epoch/src/lib.rs
index e3116dcf7..112180b25 100644
--- a/crossbeam-epoch/src/lib.rs
+++ b/crossbeam-epoch/src/lib.rs
@@ -73,10 +73,7 @@ cfg_if! {
     }
 }
 
-#[cfg_attr(
-    feature = "nightly",
-    cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
-)]
+#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 cfg_if! {
     if #[cfg(any(feature = "alloc", feature = "std"))] {
         extern crate crossbeam_utils;
diff --git a/crossbeam-skiplist/src/lib.rs b/crossbeam-skiplist/src/lib.rs
index 942b0a9d8..17e4a7bfb 100644
--- a/crossbeam-skiplist/src/lib.rs
+++ b/crossbeam-skiplist/src/lib.rs
@@ -18,10 +18,7 @@ cfg_if! {
     }
 }
 
-#[cfg_attr(
-    feature = "nightly",
-    cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
-)]
+#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 cfg_if! {
     if #[cfg(any(feature = "alloc", feature = "std"))] {
         extern crate crossbeam_epoch as epoch;
diff --git a/crossbeam-utils/src/lib.rs b/crossbeam-utils/src/lib.rs
index 4df2ac8a4..06f23beb4 100644
--- a/crossbeam-utils/src/lib.rs
+++ b/crossbeam-utils/src/lib.rs
@@ -44,10 +44,7 @@ cfg_if! {
     }
 }
 
-#[cfg_attr(
-    feature = "nightly",
-    cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
-)]
+#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 pub mod atomic;
 
 mod cache_padded;
diff --git a/src/lib.rs b/src/lib.rs
index ecff332ee..01c5a8fde 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -68,10 +68,7 @@ pub use _epoch::crossbeam_epoch as epoch;
 
 extern crate crossbeam_utils;
 
-#[cfg_attr(
-    feature = "nightly",
-    cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
-)]
+#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 pub use crossbeam_utils::atomic;
 
 /// Miscellaneous utilities.