about summary refs log tree commit diff
path: root/src/liballoc/btree/node.rs
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2018-04-02 16:05:30 +0900
committerMike Hommey <mh@glandium.org>2018-04-02 16:06:19 +0900
commitb647583c2df155f4741fa2b3e1fa6e4fb1f5868f (patch)
tree327ff3a0824d5089fcf941a635e475b358958b65 /src/liballoc/btree/node.rs
parent06fa27d7c84a21af8449e06f3c50b243c4d5a7ad (diff)
downloadrust-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/btree/node.rs')
-rw-r--r--src/liballoc/btree/node.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/btree/node.rs b/src/liballoc/btree/node.rs
index 464f8f2f4ec..49109d522e9 100644
--- a/src/liballoc/btree/node.rs
+++ b/src/liballoc/btree/node.rs
@@ -41,13 +41,14 @@
 // - A node of length `n` has `n` keys, `n` values, and (in an internal node) `n + 1` edges.
 //   This implies that even an empty internal node has at least one edge.
 
+use core::heap::{Alloc, Layout};
 use core::marker::PhantomData;
 use core::mem;
 use core::ptr::{self, Unique, NonNull};
 use core::slice;
 
 use boxed::Box;
-use heap::{Heap, Alloc, Layout};
+use heap::Heap;
 
 const B: usize = 6;
 pub const MIN_LEN: usize = B - 1;