about summary refs log tree commit diff
path: root/src/libstd/Cargo.toml
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-11 19:51:56 +0000
committerbors <bors@rust-lang.org>2018-11-11 19:51:56 +0000
commitca79ecd6940e30d4b2466bf378632efcdf5745c7 (patch)
treee8d30ebe5389de5b10097945fb3e5647b205548e /src/libstd/Cargo.toml
parent5a2ca1a6f18aa93d3120761f614ec2d39b4cb1ac (diff)
parentcc7590341a6ac213909d0ef56a7ebc2834274c8b (diff)
Auto merge of #55660 - alexcrichton:cleanup-alloc-system, r=dtolnay,SimonSapin
Remove the `alloc_system` crate

In what's hopefully one of the final nails in the coffin of the "old allocator story of yore" this PR deletes the `alloc_system` crate and all traces of it from the compiler. The compiler no longer needs to inject allocator crates anywhere and the `alloc_system` crate has no real reason to exist outside the standard library.

The unstable `alloc_system` crate is folded directly into the standard library where its stable interface, the `System` type, remains the same. All unstable traces of `alloc_system` are removed, however.
Diffstat (limited to 'src/libstd/Cargo.toml')
-rw-r--r--src/libstd/Cargo.toml4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 0f22459b343..2b1d515c83b 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -14,7 +14,6 @@ crate-type = ["dylib", "rlib"]
 
 [dependencies]
 alloc = { path = "../liballoc" }
-alloc_system = { path = "../liballoc_system" }
 panic_unwind = { path = "../libpanic_unwind", optional = true }
 panic_abort = { path = "../libpanic_abort" }
 core = { path = "../libcore" }
@@ -36,6 +35,9 @@ rustc_lsan = { path = "../librustc_lsan" }
 rustc_msan = { path = "../librustc_msan" }
 rustc_tsan = { path = "../librustc_tsan" }
 
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
+dlmalloc = { path = '../rustc/dlmalloc_shim' }
+
 [build-dependencies]
 cc = "1.0"
 build_helper = { path = "../build_helper" }