update tests for new allocator API

diff --git a/tests/compile-fail/deallocate-bad-alignment.rs b/tests/compile-fail/deallocate-bad-alignment.rs
index fb3c865fa2508b47ed7d5bffbfeb71631a7c9251..a0bcffa47d9fc784a5eb5d8d549ce4a5de35dbdb 100644 (file)
--- a/tests/compile-fail/deallocate-bad-alignment.rs
+++ b/tests/compile-fail/deallocate-bad-alignment.rs
@@ -1,13 +1,16 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
 // error-pattern: tried to deallocate or reallocate using incorrect alignment or size
 
 use alloc::heap::*;
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        deallocate(x, 1, 2);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
+        Heap.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 fb3c865fa2508b47ed7d5bffbfeb71631a7c9251..d8c4493043dbb7984bda084c8b9f9ffc912f5782 100644 (file)
--- a/tests/compile-fail/deallocate-bad-size.rs
+++ b/tests/compile-fail/deallocate-bad-size.rs
@@ -1,13 +1,16 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
 // error-pattern: tried to deallocate or reallocate using incorrect alignment or size
 
 use alloc::heap::*;
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        deallocate(x, 1, 2);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
+        Heap.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 9f0f9369a803efc726b71c04de3ab067085ce384..3c4399eaa3ed63e63d15ff3443bbd958fa77a0cd 100644 (file)
--- a/tests/compile-fail/deallocate-twice.rs
+++ b/tests/compile-fail/deallocate-twice.rs
@@ -1,14 +1,17 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
 // error-pattern: tried to deallocate with a pointer not to the beginning of an existing object
 
 use alloc::heap::*;
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        deallocate(x, 1, 1);
-        deallocate(x, 1, 1);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
+        Heap.dealloc(x, Layout::from_size_align_unchecked(1, 1));
+        Heap.dealloc(x, Layout::from_size_align_unchecked(1, 1));
     }
 }

diff --git a/tests/compile-fail/reallocate-bad-alignment.rs b/tests/compile-fail/reallocate-bad-alignment.rs
index 23fe93c5af668fdc3333d488270049af1f5242e6..246d5592957748fe23723720658c1ebf893ac470 100644 (file)
--- a/tests/compile-fail/reallocate-bad-alignment.rs
+++ b/tests/compile-fail/reallocate-bad-alignment.rs
@@ -1,13 +1,16 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
-// error-pattern: tried to access memory with alignment 1, but alignment 2 is required
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
+// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
 
 use alloc::heap::*;
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        let _y = reallocate(x, 1, 1, 2);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 2)).unwrap();
+        let _y = Heap.realloc(x, Layout::from_size_align_unchecked(1, 1), Layout::from_size_align_unchecked(1, 2)).unwrap();
     }
 }

diff --git a/tests/compile-fail/reallocate-bad-size.rs b/tests/compile-fail/reallocate-bad-size.rs
index f7f1b48a7f2431c3b0aab9314001c5e5b5683960..2e5a641838020239c98dd28f828dc78fe98bc8af 100644 (file)
--- a/tests/compile-fail/reallocate-bad-size.rs
+++ b/tests/compile-fail/reallocate-bad-size.rs
@@ -1,13 +1,16 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
 // error-pattern: tried to deallocate or reallocate using incorrect alignment or size
 
 use alloc::heap::*;
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        let _y = reallocate(x, 2, 1, 1);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
+        let _y = Heap.realloc(x, Layout::from_size_align_unchecked(2, 1), Layout::from_size_align_unchecked(1, 1)).unwrap();
     }
 }

diff --git a/tests/compile-fail/reallocate-change-alloc.rs b/tests/compile-fail/reallocate-change-alloc.rs
index a63629388e7d600e968a464c6173e9ea69d845cd..290c966a2bc8a8acb3b3e440c5286a713444a554 100644 (file)
--- a/tests/compile-fail/reallocate-change-alloc.rs
+++ b/tests/compile-fail/reallocate-change-alloc.rs
@@ -1,12 +1,14 @@
-#![feature(alloc, heap_api)]
+#![feature(alloc, allocator_api)]
 
 extern crate alloc;
 
-use alloc::heap::*;
+use alloc::heap::Heap;
+use alloc::allocator::*;
+
 fn main() {
     unsafe {
-        let x = allocate(1, 1);
-        let _y = reallocate(x, 1, 1, 1);
+        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
+        let _y = Heap.realloc(x, Layout::from_size_align_unchecked(1, 1), Layout::from_size_align_unchecked(1, 1)).unwrap();
         let _z = *x; //~ ERROR: dangling pointer was dereferenced
     }
 }