Skip to content

Commit

Permalink
Remove alloc feature from crossbeam-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed May 20, 2020
1 parent 208bda7 commit 4dc820e
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ std = [
"crossbeam-queue/std",
"crossbeam-utils/std",
]
alloc = ["crossbeam-epoch/alloc", "crossbeam-utils/alloc", "crossbeam-queue/alloc"]
alloc = ["crossbeam-epoch/alloc", "crossbeam-queue/alloc"]

[dependencies]
cfg-if = "0.1.2"
Expand Down
3 changes: 0 additions & 3 deletions ci/crossbeam-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,5 @@ if [[ "$RUST_VERSION" == "nightly" ]]; then

# Check for no_std environment.
cargo check --target thumbv7m-none-eabi --no-default-features
cargo check --target thumbv7m-none-eabi --no-default-features --features alloc
cargo check --target thumbv7m-none-eabi --no-default-features --features alloc,nightly
cargo check --target thumbv6m-none-eabi --no-default-features --features nightly
cargo check --target thumbv6m-none-eabi --no-default-features --features alloc,nightly
fi
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ categories = ["concurrency", "memory-management", "no-std"]
default = ["std"]
nightly = ["crossbeam-utils/nightly"]
std = ["alloc", "crossbeam-utils/std", "lazy_static"]
alloc = ["crossbeam-utils/alloc"]
alloc = []
sanitize = [] # Makes it more likely to trigger any potential data races.

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ categories = ["concurrency", "data-structures"]
[features]
default = ["std"]
std = ["alloc", "crossbeam-utils/std"]
alloc = ["crossbeam-utils/alloc"]
alloc = []
nightly = []

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-skiplist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ categories = ["algorithms", "concurrency", "data-structures", "no-std"]
default = ["std"]
nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"]
std = ["alloc", "crossbeam-epoch/std", "crossbeam-utils/std"]
alloc = ["crossbeam-epoch/alloc", "crossbeam-utils/alloc"]
alloc = ["crossbeam-epoch/alloc"]

[dependencies]
cfg-if = "0.1.2"
Expand Down
3 changes: 1 addition & 2 deletions crossbeam-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ categories = ["algorithms", "concurrency", "data-structures", "no-std"]
[features]
default = ["std"]
nightly = []
std = ["alloc", "lazy_static"]
alloc = []
std = ["lazy_static"]

[dependencies]
cfg-if = "0.1.2"
Expand Down
2 changes: 0 additions & 2 deletions crossbeam-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@

#[macro_use]
extern crate cfg_if;
#[cfg(feature = "alloc")]
extern crate alloc;
#[cfg(feature = "std")]
extern crate core;

Expand Down

0 comments on commit 4dc820e

Please sign in to comment.