diff --git a/src/test/run-pass/allocator-alloc-one.rs b/src/test/run-pass/allocator-alloc-one.rs index db2a16e065ef5..d4fcdcf743bc6 100644 --- a/src/test/run-pass/allocator-alloc-one.rs +++ b/src/test/run-pass/allocator-alloc-one.rs @@ -10,15 +10,15 @@ #![feature(allocator_api, nonnull)] -use std::alloc::{Heap, Alloc}; +use std::alloc::{Alloc, Global}; fn main() { unsafe { - let ptr = Heap.alloc_one::().unwrap_or_else(|_| { - Heap.oom() + let ptr = Global.alloc_one::().unwrap_or_else(|_| { + Global.oom() }); *ptr.as_ptr() = 4; assert_eq!(*ptr.as_ptr(), 4); - Heap.dealloc_one(ptr); + Global.dealloc_one(ptr); } } diff --git a/src/test/run-pass/regions-mock-trans.rs b/src/test/run-pass/regions-mock-trans.rs index 28b7ae8fd6300..44be59f5c5b1a 100644 --- a/src/test/run-pass/regions-mock-trans.rs +++ b/src/test/run-pass/regions-mock-trans.rs @@ -12,7 +12,7 @@ #![feature(allocator_api)] -use std::alloc::{Alloc, Heap, Layout}; +use std::alloc::{Alloc, Global, Layout}; use std::ptr::NonNull; struct arena(()); @@ -32,8 +32,8 @@ struct Ccx { fn alloc<'a>(_bcx : &'a arena) -> &'a Bcx<'a> { unsafe { - let ptr = Heap.alloc(Layout::new::()) - .unwrap_or_else(|_| Heap.oom()); + let ptr = Global.alloc(Layout::new::()) + .unwrap_or_else(|_| Global.oom()); &*(ptr.as_ptr() as *const _) } } @@ -46,7 +46,7 @@ fn g(fcx : &Fcx) { let bcx = Bcx { fcx: fcx }; let bcx2 = h(&bcx); unsafe { - Heap.dealloc(NonNull::new_unchecked(bcx2 as *const _ as *mut _), Layout::new::()); + Global.dealloc(NonNull::new_unchecked(bcx2 as *const _ as *mut _), Layout::new::()); } }