Move parse-fail tests to UI

[rust.git] / src / test / ui / allocator-submodule.rs

diff --git a/src/test/ui/allocator-submodule.rs b/src/test/ui/allocator-submodule.rs
index b73068244b10b85c5ad7844054bc61180f1bab12..39b65766924f97d1dc0b62a0ee6f1193f8775349 100644 (file)
--- a/src/test/ui/allocator-submodule.rs
+++ b/src/test/ui/allocator-submodule.rs
@@ -15,23 +15,26 @@
 
 extern crate alloc;
 
-use std::alloc::{GlobalAlloc, Layout, Opaque};
+use std::{
+    alloc::{GlobalAlloc, Layout},
+    ptr,
+};
 
 struct MyAlloc;
 
 unsafe impl GlobalAlloc for MyAlloc {
-    unsafe fn alloc(&self, layout: Layout) -> *mut Opaque {
-        0 as usize as *mut Opaque
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        ptr::null_mut()
     }
 
-    unsafe fn dealloc(&self, ptr: *mut Opaque, layout: Layout) {}
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {}
 }
 
 mod submod {
     use super::MyAlloc;
 
     #[global_allocator]
-    static MY_HEAP: MyAlloc = MyAlloc;
+    static MY_HEAP: MyAlloc = MyAlloc; //~ ERROR global_allocator
 }
 
 fn main() {}