diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2019-02-07 12:08:05 +0100 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2019-04-24 06:54:14 +0800 |
| commit | 1fa7a21534bde7315bc78be970a342262ddf7a58 (patch) | |
| tree | bfad0820f65e2fd60b1677520fe094371a8cf943 /src | |
| parent | 556fc40a95be2ea20e33ad34c32598cf2e3edf72 (diff) | |
| download | rust-1fa7a21534bde7315bc78be970a342262ddf7a58.tar.gz rust-1fa7a21534bde7315bc78be970a342262ddf7a58.zip | |
Make libstd depend on the hashbrown crate
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/tools/rustc-std-workspace-alloc/Cargo.toml | 14 | ||||
| -rw-r--r-- | src/tools/rustc-std-workspace-alloc/lib.rs | 9 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 86ad334d886..83aee507f32 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -22,6 +22,7 @@ libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of compiler_builtins = { version = "0.1.9" } profiler_builtins = { path = "../libprofiler_builtins", optional = true } unwind = { path = "../libunwind" } +hashbrown = { version = "0.2.0", features = ['rustc-dep-of-std'] } rustc-demangle = { version = "0.1.10", features = ['rustc-dep-of-std'] } backtrace-sys = { version = "0.1.24", features = ["rustc-dep-of-std"], optional = true } diff --git a/src/tools/rustc-std-workspace-alloc/Cargo.toml b/src/tools/rustc-std-workspace-alloc/Cargo.toml new file mode 100644 index 00000000000..98578914963 --- /dev/null +++ b/src/tools/rustc-std-workspace-alloc/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "rustc-std-workspace-alloc" +version = "1.0.0" +authors = ["Alex Crichton <alex@alexcrichton.com>"] +license = 'MIT/Apache-2.0' +description = """ +Hack for the compiler's own build system +""" + +[lib] +path = "lib.rs" + +[dependencies] +alloc = { path = "../../liballoc" } diff --git a/src/tools/rustc-std-workspace-alloc/lib.rs b/src/tools/rustc-std-workspace-alloc/lib.rs new file mode 100644 index 00000000000..50294e6cbad --- /dev/null +++ b/src/tools/rustc-std-workspace-alloc/lib.rs @@ -0,0 +1,9 @@ +#![feature(no_core, alloc)] +#![no_core] + +// See rustc-std-workspace-core for why this crate is needed. + +// Rename the crate to avoid conflicting with the alloc module in liballoc. +extern crate alloc as foo; + +pub use foo::*; |
