Merge #577

577: Update cfg-if to 1 r=taiki-e a=taiki-e Co-authored-by: Taiki Endo <te316e89@gmail.com>
crossbeam-rs · Oct 9, 2020 · e08b21c · e08b21c
2 parents 2444749 + 6217abf
commit e08b21c
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,7 +42,7 @@ alloc = ["crossbeam-epoch/alloc", "crossbeam-queue/alloc"]
 nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly", "crossbeam-queue/nightly"]
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 
 [dependencies.crossbeam-channel]
 version = "0.4"

diff --git a/crossbeam-channel/Cargo.toml b/crossbeam-channel/Cargo.toml
@@ -24,7 +24,7 @@ default = ["std"]
 std = ["crossbeam-utils/std"]
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 
 [dependencies.crossbeam-utils]
 version = "0.7"

diff --git a/crossbeam-channel/src/lib.rs b/crossbeam-channel/src/lib.rs
@@ -330,6 +330,8 @@
 ))]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 

diff --git a/crossbeam-deque/Cargo.toml b/crossbeam-deque/Cargo.toml
@@ -24,7 +24,7 @@ default = ["std"]
 std = ["crossbeam-epoch/std", "crossbeam-utils/std"]
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 
 [dependencies.crossbeam-epoch]
 version = "0.8"

diff --git a/crossbeam-deque/src/lib.rs b/crossbeam-deque/src/lib.rs
@@ -91,6 +91,8 @@
 ))]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 

diff --git a/crossbeam-epoch/Cargo.toml b/crossbeam-epoch/Cargo.toml
@@ -37,7 +37,7 @@ nightly = ["crossbeam-utils/nightly"]
 sanitize = [] # Makes it more likely to trigger any potential data races.
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 const_fn = "0.4"
 memoffset = "0.5.4"
 

diff --git a/crossbeam-epoch/src/lib.rs b/crossbeam-epoch/src/lib.rs
@@ -59,6 +59,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
 #![cfg_attr(feature = "nightly", feature(const_fn))]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 

diff --git a/crossbeam-queue/Cargo.toml b/crossbeam-queue/Cargo.toml
@@ -34,7 +34,7 @@ alloc = []
 nightly = ["crossbeam-utils/nightly"]
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 
 [dependencies.crossbeam-utils]
 version = "0.7"

diff --git a/crossbeam-queue/src/lib.rs b/crossbeam-queue/src/lib.rs
@@ -15,6 +15,8 @@
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 #[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 cfg_if::cfg_if! {

diff --git a/crossbeam-skiplist/Cargo.toml b/crossbeam-skiplist/Cargo.toml
@@ -34,7 +34,7 @@ alloc = ["crossbeam-epoch/alloc"]
 nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"]
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 
 [dependencies.crossbeam-epoch]
 version = "0.8"

diff --git a/crossbeam-skiplist/src/lib.rs b/crossbeam-skiplist/src/lib.rs
@@ -10,6 +10,8 @@
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 use cfg_if::cfg_if;
 

diff --git a/crossbeam-utils/Cargo.toml b/crossbeam-utils/Cargo.toml
@@ -30,7 +30,7 @@ std = ["lazy_static"]
 nightly = []
 
 [dependencies]
-cfg-if = "0.1.10"
+cfg-if = "1"
 const_fn = "0.4"
 lazy_static = { version = "1.4.0", optional = true }
 

diff --git a/crossbeam-utils/src/lib.rs b/crossbeam-utils/src/lib.rs
@@ -34,6 +34,8 @@
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 #[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 pub mod atomic;

diff --git a/src/lib.rs b/src/lib.rs
@@ -48,6 +48,8 @@
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
+// matches! requires Rust 1.42
+#![allow(clippy::match_like_matches_macro)]
 
 #[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
 pub use crossbeam_utils::atomic;