Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cfg-if to 1 #577

Merged
merged 2 commits into from Oct 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-channel/Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions crossbeam-channel/src/lib.rs
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-deque/Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions crossbeam-deque/src/lib.rs
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Expand Up @@ -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"

Expand Down
2 changes: 2 additions & 0 deletions crossbeam-epoch/src/lib.rs
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-queue/Cargo.toml
Expand Up @@ -34,7 +34,7 @@ alloc = []
nightly = ["crossbeam-utils/nightly"]

[dependencies]
cfg-if = "0.1.10"
cfg-if = "1"

[dependencies.crossbeam-utils]
version = "0.7"
Expand Down
2 changes: 2 additions & 0 deletions crossbeam-queue/src/lib.rs
Expand Up @@ -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! {
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-skiplist/Cargo.toml
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions crossbeam-skiplist/src/lib.rs
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Expand Up @@ -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 }

Expand Down
2 changes: 2 additions & 0 deletions crossbeam-utils/src/lib.rs
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Expand Up @@ -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;
Expand Down