Auto merge of #1308 - RalfJung:miri, r=RalfJung

[rust.git] / tests / compile-fail / deallocate-bad-size.rs

diff --git a/tests/compile-fail/deallocate-bad-size.rs b/tests/compile-fail/deallocate-bad-size.rs
index 3b7b3cc6a7262527446a60438728c057acae693e..386bb56b90916c5d30099bb22232043fdfe719df 100644 (file)
--- a/tests/compile-fail/deallocate-bad-size.rs
+++ b/tests/compile-fail/deallocate-bad-size.rs
@@ -1,15 +1,10 @@
-#![feature(allocator_api)]
+use std::alloc::{alloc, dealloc, Layout};
 
-extern crate alloc;
-
-use alloc::alloc::Global;
-use std::alloc::{AllocRef, Layout};
-
-// error-pattern: incorrect alloc info: expected size 2 and align 1, got size 1 and align 1
+// error-pattern: allocation has size 1 and alignment 1, but gave size 2 and alignment 1
 
 fn main() {
     unsafe {
-        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0;
-        Global.dealloc(x, Layout::from_size_align_unchecked(2, 1));
+        let x = alloc(Layout::from_size_align_unchecked(1, 1));
+        dealloc(x, Layout::from_size_align_unchecked(2, 1));
     }
 }