From 9cbfae7380c902dd29cf83c812cf1d721f970c96 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 9 Oct 2020 22:26:16 +0900 Subject: [PATCH 1/2] Update cfg-if to 1 --- Cargo.toml | 2 +- crossbeam-channel/Cargo.toml | 2 +- crossbeam-deque/Cargo.toml | 2 +- crossbeam-epoch/Cargo.toml | 2 +- crossbeam-queue/Cargo.toml | 2 +- crossbeam-skiplist/Cargo.toml | 2 +- crossbeam-utils/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 93cd2f520..60887ad1c 100644 --- 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 index 429dc4817..42ec68847 100644 --- 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-deque/Cargo.toml b/crossbeam-deque/Cargo.toml index 6de900e14..ce287a5bc 100644 --- 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-epoch/Cargo.toml b/crossbeam-epoch/Cargo.toml index 10611979d..898d5ab84 100644 --- 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-queue/Cargo.toml b/crossbeam-queue/Cargo.toml index 2dc86e6e6..a9c4e24a5 100644 --- 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-skiplist/Cargo.toml b/crossbeam-skiplist/Cargo.toml index a07fac859..30ec9f214 100644 --- 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-utils/Cargo.toml b/crossbeam-utils/Cargo.toml index eaa82ccbc..b1439d96c 100644 --- 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 } From 6217abf4a97b85c22b8dbae247503779af182741 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 9 Oct 2020 22:35:18 +0900 Subject: [PATCH 2/2] Ignore clippy::match_like_matches_macro lint matches! requires Rust 1.42 --- crossbeam-channel/src/lib.rs | 2 ++ crossbeam-deque/src/lib.rs | 2 ++ crossbeam-epoch/src/lib.rs | 2 ++ crossbeam-queue/src/lib.rs | 2 ++ crossbeam-skiplist/src/lib.rs | 2 ++ crossbeam-utils/src/lib.rs | 2 ++ src/lib.rs | 2 ++ 7 files changed, 14 insertions(+) diff --git a/crossbeam-channel/src/lib.rs b/crossbeam-channel/src/lib.rs index 76f905a8d..e08ac08f9 100644 --- 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/src/lib.rs b/crossbeam-deque/src/lib.rs index fcdb51997..dea6153b0 100644 --- 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/src/lib.rs b/crossbeam-epoch/src/lib.rs index 092d71c33..f64d16cd8 100644 --- 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/src/lib.rs b/crossbeam-queue/src/lib.rs index 29ab156fc..88203f6cf 100644 --- 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/src/lib.rs b/crossbeam-skiplist/src/lib.rs index 9ca0c51cb..fb01f8bda 100644 --- 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/src/lib.rs b/crossbeam-utils/src/lib.rs index 50babcb66..f2bd460b9 100644 --- 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 index aa985698f..72afa7a48 100644 --- 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;