diff --git a/tests/compile-fail/deallocate-bad-alignment.rs b/tests/compile-fail/deallocate-bad-alignment.rs index 2ac35a450cf1..876339919717 100644 --- a/tests/compile-fail/deallocate-bad-alignment.rs +++ b/tests/compile-fail/deallocate-bad-alignment.rs @@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.dealloc(x, Layout::from_size_align_unchecked(1, 2)); } } diff --git a/tests/compile-fail/deallocate-bad-size.rs b/tests/compile-fail/deallocate-bad-size.rs index c5b48f5ddf59..3b7b3cc6a726 100644 --- a/tests/compile-fail/deallocate-bad-size.rs +++ b/tests/compile-fail/deallocate-bad-size.rs @@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.dealloc(x, Layout::from_size_align_unchecked(2, 1)); } } diff --git a/tests/compile-fail/deallocate-twice.rs b/tests/compile-fail/deallocate-twice.rs index 02c442f0ab85..ee4c5dbedf90 100644 --- a/tests/compile-fail/deallocate-twice.rs +++ b/tests/compile-fail/deallocate-twice.rs @@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); } diff --git a/tests/compile-fail/reallocate-bad-size.rs b/tests/compile-fail/reallocate-bad-size.rs index 905e8e061721..f7117dbb646d 100644 --- a/tests/compile-fail/reallocate-bad-size.rs +++ b/tests/compile-fail/reallocate-bad-size.rs @@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.realloc(x, Layout::from_size_align_unchecked(2, 1), 1).unwrap(); } } diff --git a/tests/compile-fail/reallocate-change-alloc.rs b/tests/compile-fail/reallocate-change-alloc.rs index 21468739b31c..df517f9c81f2 100644 --- a/tests/compile-fail/reallocate-change-alloc.rs +++ b/tests/compile-fail/reallocate-change-alloc.rs @@ -7,7 +7,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap(); let _z = *(x.as_ptr() as *mut u8); //~ ERROR dangling pointer was dereferenced } diff --git a/tests/compile-fail/reallocate-dangling.rs b/tests/compile-fail/reallocate-dangling.rs index ee73cfce8634..19a9017e71b8 100644 --- a/tests/compile-fail/reallocate-dangling.rs +++ b/tests/compile-fail/reallocate-dangling.rs @@ -9,7 +9,7 @@ use std::alloc::{AllocRef, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap(); + let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap(); } diff --git a/tests/run-pass/heap_allocator.rs b/tests/run-pass/heap_allocator.rs index 907fbf962df0..8077be405f4b 100644 --- a/tests/run-pass/heap_allocator.rs +++ b/tests/run-pass/heap_allocator.rs @@ -9,28 +9,28 @@ fn check_alloc(mut allocator: T) { unsafe { let layout = Layout::from_size_align(20, align).unwrap(); for _ in 0..32 { - let a = allocator.alloc(layout).unwrap(); + let a = allocator.alloc(layout).unwrap().0; assert_eq!(a.as_ptr() as usize % align, 0, "pointer is incorrectly aligned"); allocator.dealloc(a, layout); } - let p1 = allocator.alloc_zeroed(layout).unwrap(); + let p1 = allocator.alloc_zeroed(layout).unwrap().0; assert_eq!(p1.as_ptr() as usize % align, 0, "pointer is incorrectly aligned"); - let p2 = allocator.realloc(p1, layout, 40).unwrap(); + let p2 = allocator.realloc(p1, layout, 40).unwrap().0; let layout = Layout::from_size_align(40, align).unwrap(); assert_eq!(p2.as_ptr() as usize % align, 0, "pointer is incorrectly aligned"); let slice = slice::from_raw_parts(p2.as_ptr(), 20); assert_eq!(&slice, &[0_u8; 20]); // old size == new size - let p3 = allocator.realloc(p2, layout, 40).unwrap(); + let p3 = allocator.realloc(p2, layout, 40).unwrap().0; assert_eq!(p3.as_ptr() as usize % align, 0, "pointer is incorrectly aligned"); let slice = slice::from_raw_parts(p3.as_ptr(), 20); assert_eq!(&slice, &[0_u8; 20]); // old size > new size - let p4 = allocator.realloc(p3, layout, 10).unwrap(); + let p4 = allocator.realloc(p3, layout, 10).unwrap().0; let layout = Layout::from_size_align(10, align).unwrap(); assert_eq!(p4.as_ptr() as usize % align, 0, "pointer is incorrectly aligned"); let slice = slice::from_raw_parts(p4.as_ptr(), 10); @@ -46,7 +46,7 @@ fn check_align_requests(mut allocator: T) { let iterations = 32; unsafe { let pointers: Vec<_> = (0..iterations).map(|_| { - allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap() + allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap().0 }).collect(); for &ptr in &pointers { assert_eq!((ptr.as_ptr() as usize) % align, 0, @@ -67,7 +67,7 @@ fn global_to_box() { let l = Layout::new::(); // allocate manually with global allocator, then turn into Box and free there unsafe { - let ptr = Global.alloc(l).unwrap().as_ptr() as *mut T; + let ptr = Global.alloc(l).unwrap().0.as_ptr() as *mut T; let b = Box::from_raw(ptr); drop(b); }