diff options
| author | Mike Hommey <mh@glandium.org> | 2018-04-02 16:05:30 +0900 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2018-04-02 16:06:19 +0900 |
| commit | b647583c2df155f4741fa2b3e1fa6e4fb1f5868f (patch) | |
| tree | 327ff3a0824d5089fcf941a635e475b358958b65 /src/liballoc_jemalloc/lib.rs | |
| parent | 06fa27d7c84a21af8449e06f3c50b243c4d5a7ad (diff) | |
| download | rust-b647583c2df155f4741fa2b3e1fa6e4fb1f5868f.tar.gz rust-b647583c2df155f4741fa2b3e1fa6e4fb1f5868f.zip | |
Use Alloc and Layout from core::heap.
94d1970bba87f2d2893f6e934e4c3f02ed50604d moved the alloc::allocator module to core::heap, moving e.g. Alloc and Layout out of the alloc crate. While alloc::heap reexports them, it's better to use them from where they really come from.
Diffstat (limited to 'src/liballoc_jemalloc/lib.rs')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index d7370ae400d..7a8d01e4ef8 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -15,7 +15,6 @@ form or name", issue = "27783")] #![deny(warnings)] -#![feature(alloc)] #![feature(alloc_system)] #![feature(libc)] #![feature(linkage)] @@ -25,7 +24,6 @@ #![cfg_attr(not(dummy_jemalloc), feature(allocator_api))] #![rustc_alloc_kind = "exe"] -extern crate alloc; extern crate alloc_system; extern crate libc; @@ -35,7 +33,7 @@ pub use contents::*; mod contents { use core::ptr; - use alloc::heap::{Alloc, AllocErr, Layout}; + use core::heap::{Alloc, AllocErr, Layout}; use alloc_system::System; use libc::{c_int, c_void, size_t}; |
