bjoernager/rust
bjoernager/rust
1
Fork 0
Code 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

3
src/liballoc/arc.rs
View file

@ -21,6 +21,7 @@ use core::sync::atomic::Ordering::{Acquire, Relaxed, Release, SeqCst};
use core::borrow;
use core::fmt;
use core::cmp::Ordering;
use core::heap::{Alloc, Layout};
use core::intrinsics::abort;
use core::mem::{self, align_of_val, size_of_val, uninitialized};
use core::ops::Deref;
@ -31,7 +32,7 @@ use core::hash::{Hash, Hasher};
use core::{isize, usize};
use core::convert::From;
use heap::{Heap, Alloc, Layout, box_free};
use heap::{Heap, box_free};
use boxed::Box;
use string::String;
use vec::Vec;