Skip to content

Commit 3587420

Browse files
committed
Auto merge of #197 - mbrubeck:alloc, r=Amanieu
Use the alloc crate on stable Rust Since the minimum supported Rust version has increased to 1.36 (#193), the alloc crate no longer requires nightly features.
2 parents b834830 + 3046ed2 commit 3587420

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ keywords = ["hash", "no_std", "hashmap", "swisstable"]
1010
categories = ["data-structures", "no-std"]
1111
exclude = [".travis.yml", "bors.toml", "/ci/*"]
1212
edition = "2018"
13-
build = "build.rs"
1413

1514
[dependencies]
1615
# For the default hasher
@@ -25,9 +24,6 @@ core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core
2524
compiler_builtins = { version = "0.1.2", optional = true }
2625
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
2726

28-
[build-dependencies]
29-
autocfg = "1"
30-
3127
[dev-dependencies]
3228
lazy_static = "1.2"
3329
rand = { version = "0.7.3", features = ["small_rng"] }

build.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/lib.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@
1212
#![no_std]
1313
#![cfg_attr(
1414
feature = "nightly",
15-
feature(
16-
alloc_layout_extra,
17-
allocator_api,
18-
test,
19-
core_intrinsics,
20-
dropck_eyepatch,
21-
min_specialization,
22-
extend_one,
23-
)
15+
feature(test, core_intrinsics, dropck_eyepatch, min_specialization, extend_one)
2416
)]
2517
#![allow(
2618
clippy::doc_markdown,
@@ -35,11 +27,8 @@
3527
#[macro_use]
3628
extern crate std;
3729

38-
#[cfg(has_extern_crate_alloc)]
3930
#[cfg_attr(test, macro_use)]
4031
extern crate alloc;
41-
#[cfg(not(has_extern_crate_alloc))]
42-
extern crate std as alloc;
4332

4433
#[cfg(feature = "nightly")]
4534
#[cfg(doctest)]

0 commit comments

Comments
 (0)