rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use Alloc and Layout from core::heap.

Browse Source 
94d1970bba 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.
This commit is contained in:
Mike Hommey
2018-04-02 16:05:30 +09:00
parent 06fa27d7c8
commit b647583c2d
9 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/liballoc_system/lib.rs
View File

@@ -17,7 +17,6 @@
issue = "32838")]
#![feature(global_allocator)]
#![feature(allocator_api)]
#![feature(alloc)]
#![feature(core_intrinsics)]
#![feature(staged_api)]
#![feature(rustc_attrs)]
@@ -43,9 +42,7 @@ const MIN_ALIGN: usize = 8;
#[allow(dead_code)]
const MIN_ALIGN: usize = 16;
extern crate alloc;
use self::alloc::heap::{Alloc, AllocErr, Layout, Excess, CannotReallocInPlace};
use core::heap::{Alloc, AllocErr, Layout, Excess, CannotReallocInPlace};
#[unstable(feature = "allocator_api", issue = "32838")]
pub struct System;
@@ -125,7 +122,7 @@ mod platform {
use MIN_ALIGN;
use System;
use alloc::heap::{Alloc, AllocErr, Layout};
use core::heap::{Alloc, AllocErr, Layout};
#[unstable(feature = "allocator_api", issue = "32838")]
unsafe impl<'a> Alloc for &'a System {
@@ -279,7 +276,7 @@ mod platform {
use MIN_ALIGN;
use System;
use alloc::heap::{Alloc, AllocErr, Layout, CannotReallocInPlace};
use core::heap::{Alloc, AllocErr, Layout, CannotReallocInPlace};
type LPVOID = *mut u8;
type HANDLE = LPVOID;
@@ -491,7 +488,7 @@ mod platform {
mod platform {
extern crate dlmalloc;
use alloc::heap::{Alloc, AllocErr, Layout, Excess, CannotReallocInPlace};
use core::heap::{Alloc, AllocErr, Layout, Excess, CannotReallocInPlace};
use System;
use self::dlmalloc::GlobalDlmalloc;