Merge #428

bors[bot] · taiki-e · web-flow · commit f06c1af0b423 · 2019-10-15T14:13:27.000Z
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 Co-authored-by: Taiki Endo <te316e89@gmail.com>
diff --git 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
@@ -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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,7 @@ cfg_if! {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`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"))]`
`80`	`77`	`cfg_if! {`
`81`	`78`	`if #[cfg(any(feature = "alloc", feature = "std"))] {`
`82`	`79`	`extern crate crossbeam_utils;`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@ cfg_if! {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`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"))]`
`25`	`22`	`cfg_if! {`
`26`	`23`	`if #[cfg(any(feature = "alloc", feature = "std"))] {`
`27`	`24`	`extern crate crossbeam_epoch as epoch;`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,7 @@ cfg_if! {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`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"))]`
`51`	`48`	`pub mod atomic;`
`52`	`49`
`53`	`50`	`mod cache_padded;`