diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-04-03 20:58:50 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-04-12 22:52:54 +0200 |
| commit | 5e5a0c21fc1416e77ae8e4db74b93e3601241e22 (patch) | |
| tree | 505783f515b56e9c23a35f2f6977cf5fe3b8210c /src/liballoc_jemalloc | |
| parent | e521b8b472dfe058f6d0f62f2e1ab5f291c220ee (diff) | |
| download | rust-5e5a0c21fc1416e77ae8e4db74b93e3601241e22.tar.gz rust-5e5a0c21fc1416e77ae8e4db74b93e3601241e22.zip | |
Separate alloc::heap::Alloc trait for stage0 #[global_allocator]
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc_jemalloc/Cargo.toml b/src/liballoc_jemalloc/Cargo.toml index fd4a4553046..02435170374 100644 --- a/src/liballoc_jemalloc/Cargo.toml +++ b/src/liballoc_jemalloc/Cargo.toml @@ -12,7 +12,6 @@ test = false doc = false [dependencies] -alloc = { path = "../liballoc" } alloc_system = { path = "../liballoc_system" } core = { path = "../libcore" } libc = { path = "../rustc/libc_shim" } diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index df7e3f61f5f..616181d99bc 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -32,7 +32,7 @@ pub use contents::*; mod contents { use core::ptr; - use core::heap::{Alloc, AllocErr, Layout}; + use core::alloc::{Alloc, AllocErr, Layout}; use alloc_system::System; use libc::{c_int, c_void, size_t}; |