Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-i-m committed Jun 24, 2018
1 parent 08479aa commit e353402
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/test/ui/allocator-submodule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@

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 {
Expand Down

0 comments on commit e353402

Please sign in to comment.