Update error messages

diff --git a/tests/compile-fail/deallocate-bad-alignment.rs b/tests/compile-fail/deallocate-bad-alignment.rs
index c1ae7477c81a8adc22ff8a02eaef41c2dd04e19c..b64740de81f4d0c79e8a13358fbf69ed15bf4cba 100644 (file)
--- a/tests/compile-fail/deallocate-bad-alignment.rs
+++ b/tests/compile-fail/deallocate-bad-alignment.rs
@@ -5,7 +5,7 @@
 use alloc::heap::Heap;
 use alloc::allocator::*;
 
-// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
+// error-pattern: incorrect alloc info: expected size 1 and align 2, got size 1 and align 1
 
 fn main() {
     unsafe {

diff --git a/tests/compile-fail/deallocate-bad-size.rs b/tests/compile-fail/deallocate-bad-size.rs
index 5577f10736d2e39371df6848291140b809c57a34..f5b82f65d2af326cb88660891c960393115df031 100644 (file)
--- a/tests/compile-fail/deallocate-bad-size.rs
+++ b/tests/compile-fail/deallocate-bad-size.rs
@@ -5,7 +5,7 @@
 use alloc::heap::Heap;
 use alloc::allocator::*;
 
-// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
+// error-pattern: incorrect alloc info: expected size 2 and align 1, got size 1 and align 1
 
 fn main() {
     unsafe {

diff --git a/tests/compile-fail/invalid_bool.rs b/tests/compile-fail/invalid_bool.rs
index c30c9b439a46b495c1b91c6ccc8043abd137fbc6..9de2630797ece3415241ad08e0226375f3fd9cc9 100644 (file)
--- a/tests/compile-fail/invalid_bool.rs
+++ b/tests/compile-fail/invalid_bool.rs
@@ -1,4 +1,4 @@
 fn main() {
-    let b = unsafe { std::mem::transmute::<u8, bool>(2) }; //~ ERROR: invalid boolean value read
-    if b { unreachable!() } else { unreachable!() }
+    let b = unsafe { std::mem::transmute::<u8, bool>(2) };
+    if b { unreachable!() } else { unreachable!() } //~ ERROR: invalid boolean value read
 }

diff --git a/tests/compile-fail/match_char.rs b/tests/compile-fail/match_char.rs
index 4fee6e692bada0913b093aeb2892fac4f610d8ea..a91c7fef6aa1e92b3d4709d26f1b56fb47c343af 100644 (file)
--- a/tests/compile-fail/match_char.rs
+++ b/tests/compile-fail/match_char.rs
@@ -1,7 +1,7 @@
 fn main() {
     assert!(std::char::from_u32(-1_i32 as u32).is_none());
-    match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ERROR tried to interpret an invalid 32-bit value as a char: 4294967295
-        'a' => {},
+    match unsafe { std::mem::transmute::<i32, char>(-1) } {
+        'a' => {}, //~ERROR tried to interpret an invalid 32-bit value as a char: 4294967295
         'b' => {},
         _ => {},
     }

diff --git a/tests/compile-fail/reallocate-bad-alignment-2.rs b/tests/compile-fail/reallocate-bad-alignment-2.rs
index cd6214440ff262e572a6a1e6acaa25f896dca906..fae8246c5d29c2bbec346a2200e6180a20df7354 100644 (file)
--- a/tests/compile-fail/reallocate-bad-alignment-2.rs
+++ b/tests/compile-fail/reallocate-bad-alignment-2.rs
@@ -5,7 +5,7 @@
 use alloc::heap::Heap;
 use alloc::allocator::*;
 
-// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
+// error-pattern: incorrect alloc info: expected size 1 and align 2, got size 1 and align 1
 
 fn main() {
     unsafe {

diff --git a/tests/compile-fail/reallocate-bad-alignment.rs b/tests/compile-fail/reallocate-bad-alignment.rs
index da5fe1d81909d4cc36b758b65aa8a6420b0af612..6a928de07eec3dfe908e7d0332d3d70780354bdb 100644 (file)
--- a/tests/compile-fail/reallocate-bad-alignment.rs
+++ b/tests/compile-fail/reallocate-bad-alignment.rs
@@ -5,7 +5,7 @@
 use alloc::heap::Heap;
 use alloc::allocator::*;
 
-// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
+// error-pattern: incorrect alloc info: expected size 1 and align 1, got size 1 and align 2
 
 fn main() {
     unsafe {

diff --git a/tests/compile-fail/reallocate-bad-size.rs b/tests/compile-fail/reallocate-bad-size.rs
index 953178742c46fb03e14bca2bf74cd93ce647ce3e..d57c610d9337f806ead81c256b61334f80034d28 100644 (file)
--- a/tests/compile-fail/reallocate-bad-size.rs
+++ b/tests/compile-fail/reallocate-bad-size.rs
@@ -5,7 +5,7 @@
 use alloc::heap::Heap;
 use alloc::allocator::*;
 
-// error-pattern: tried to deallocate or reallocate using incorrect alignment or size
+// error-pattern: incorrect alloc info: expected size 2 and align 1, got size 1 and align 1
 
 fn main() {
     unsafe {