Fix a couple of tests

tests/compile-fail/copy_nonoverlapping.rs

@@ -10,8 +10,6 @@
 
 #![feature(core_intrinsics)]
 
-use std::intrinsics::*;
-
 //error-pattern: copy_nonoverlapping called on overlapping ranges
 
 fn main() {

tests/compile-fail/deallocate-bad-alignment.rs

@@ -2,14 +2,14 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 // error-pattern: incorrect alloc info: expected size 1 and align 2, got size 1 and align 1
 
 fn main() {
     unsafe {
-        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
-        Heap.dealloc(x, Layout::from_size_align_unchecked(1, 2));
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        Global.dealloc(x, Layout::from_size_align_unchecked(1, 2));
     }
 }

tests/compile-fail/deallocate-bad-size.rs

@@ -2,14 +2,14 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 // error-pattern: incorrect alloc info: expected size 2 and align 1, got size 1 and align 1
 
 fn main() {
     unsafe {
-        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
-        Heap.dealloc(x, Layout::from_size_align_unchecked(2, 1));
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        Global.dealloc(x, Layout::from_size_align_unchecked(2, 1));
     }
 }

tests/compile-fail/deallocate-twice.rs

@@ -2,15 +2,15 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 // error-pattern: tried to deallocate dangling pointer
 
 fn main() {
     unsafe {
-        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));
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
+        Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
     }
 }

tests/compile-fail/never_transmute_humans.rs

@@ -1,17 +0,0 @@
-// This should fail even without validation
-// compile-flags: -Zmir-emit-validate=0
-
-#![feature(never_type)]
-#![allow(unreachable_code)]
-#![allow(unused_variables)]
-
-struct Human;
-
-fn main() {
-    let x: ! = unsafe {
-        std::mem::transmute::<Human, !>(Human) //~ ERROR entered unreachable code
-    };
-    f(x)
-}
-
-fn f(x: !) -> ! { x }

tests/compile-fail/out_of_bounds_ptr_2.rs

@@ -1,4 +1,4 @@
-// error-pattern: overflowing math
+// error-pattern: attempt to add with overflow
 fn main() {
     let v = [0i8; 4];
     let x = &v as *const i8;

tests/compile-fail/ptr_offset_overflow.rs

@@ -1,4 +1,4 @@
-//error-pattern: overflowing math
+//error-pattern: attempt to add with overflow
 fn main() {
     let v = [1i8, 2];
     let x = &v[1] as *const i8;

tests/compile-fail/reallocate-bad-alignment-2.rs

@@ -1,16 +0,0 @@
-#![feature(alloc, allocator_api)]
-
-extern crate alloc;
-
-use alloc::heap::Heap;
-use alloc::allocator::*;
-
-// error-pattern: incorrect alloc info: expected size 1 and align 2, got size 1 and align 1
-
-fn main() {
-    unsafe {
-        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
-        // Try realloc with a too big alignment.
-        let _y = Heap.realloc(x, Layout::from_size_align_unchecked(1, 2), Layout::from_size_align_unchecked(1, 1)).unwrap();
-    }
-}

tests/compile-fail/reallocate-bad-alignment.rs

@@ -1,16 +0,0 @@
-#![feature(alloc, allocator_api)]
-
-extern crate alloc;
-
-use alloc::heap::Heap;
-use alloc::allocator::*;
-
-// error-pattern: incorrect alloc info: expected size 1 and align 1, got size 1 and align 2
-
-fn main() {
-    unsafe {
-        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 2)).unwrap();
-        // Try realloc with a too small alignment.
-        let _y = Heap.realloc(x, Layout::from_size_align_unchecked(1, 1), Layout::from_size_align_unchecked(1, 2)).unwrap();
-    }
-}

tests/compile-fail/reallocate-bad-size.rs

@@ -2,14 +2,14 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 // error-pattern: incorrect alloc info: expected size 2 and align 1, got size 1 and align 1
 
 fn main() {
     unsafe {
-        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();
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        let _y = Global.realloc(x, Layout::from_size_align_unchecked(2, 1), 1);
     }
 }

tests/compile-fail/reallocate-change-alloc.rs

@@ -2,13 +2,13 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 fn main() {
     unsafe {
-        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
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        let _y = Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1);
+        let _z = *(x as *mut u8); //~ ERROR: dangling pointer was dereferenced
     }
 }

tests/compile-fail/reallocate-dangling.rs

@@ -2,15 +2,15 @@
 
 extern crate alloc;
 
-use alloc::heap::Heap;
-use alloc::allocator::*;
+use alloc::alloc::Global;
+use std::alloc::*;
 
 // error-pattern: dangling pointer was dereferenced
 
 fn main() {
     unsafe {
-        let x = Heap.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap();
-        Heap.dealloc(x, Layout::from_size_align_unchecked(1, 1));
-        Heap.realloc(x, Layout::from_size_align_unchecked(1, 1), Layout::from_size_align_unchecked(1, 1));
+        let x = Global.alloc(Layout::from_size_align_unchecked(1, 1));
+        Global.dealloc(x, Layout::from_size_align_unchecked(1, 1));
+        Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1);
     }
 }

tests/compile-fail/repeat.rs

@@ -1,5 +1,6 @@
+// error-pattern the type `[u8;
+
 fn main() {
     let data: [u8; std::usize::MAX] = [42; std::usize::MAX];
-    //~^ ERROR: rustc layout computation failed: SizeOverflow([u8;
     assert_eq!(data.len(), 1024);
 }

tests/compile-fail/repeat2.rs

@@ -1,3 +1,5 @@
+// ignore-test
+
 fn main() {
     let data: [u8; 1024*1024*1024] = [42; 1024*1024*1024];
     //~^ ERROR: tried to allocate

tests/compile-fail/transmute_fat.rs

@@ -1,6 +1,5 @@
 // This should fail even without validation
 // compile-flags: -Zmir-emit-validate=0
-#![feature(i128_type)]
 
 fn main() {
     #[cfg(target_pointer_width="64")]
@@ -11,5 +10,5 @@ fn main() {
     let bad = unsafe {
         std::mem::transmute::<&[u8], u64>(&[1u8])
     };
-    bad + 1; //~ ERROR a raw memory access tried to access part of a pointer value as raw bytes
+    let _ = bad + 1; //~ ERROR a raw memory access tried to access part of a pointer value as raw bytes
 }

tests/compile-fail/transmute_fat2.rs

@@ -1,5 +1,3 @@
-#![feature(i128_type)]
-
 fn main() {
     #[cfg(target_pointer_width="64")]
     let bad = unsafe {

tests/compile-fail/validation_aliasing_mut1.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_aliasing_mut2.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_aliasing_mut3.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_aliasing_mut4.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_buggy_as_mut_slice.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 // For some reason, the error location is different when using fullmir

tests/compile-fail/validation_buggy_split_at_mut.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_illegal_write.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_lock_confusion.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 // Make sure validation can handle many overlapping shared borrows for different parts of a data structure
 #![allow(unused_variables)]
 use std::cell::RefCell;

tests/compile-fail/validation_pointer_smuggling.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 static mut PTR: *mut u8 = 0 as *mut _;

tests/compile-fail/validation_recover1.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 #[repr(u32)]

tests/compile-fail/validation_recover2.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_recover3.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 
 mod safe {

tests/compile-fail/validation_undef.rs

@@ -1,3 +1,5 @@
+// ignore-test validation_op is disabled
+
 #![allow(unused_variables)]
 // error-pattern: attempted to read undefined bytes