diff --git a/tests/compile-fail/deallocate-bad-alignment.rs b/tests/compile-fail/deallocate-bad-alignment.rs index f2cd87bac622..9b5ee9a934b0 100644 --- a/tests/compile-fail/deallocate-bad-alignment.rs +++ b/tests/compile-fail/deallocate-bad-alignment.rs @@ -1,15 +1,10 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; // error-pattern: allocation has size 1 and alignment 1, but gave size 1 and alignment 2 fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; - Global.dealloc(x, Layout::from_size_align_unchecked(1, 2)); + let x = alloc(Layout::from_size_align_unchecked(1, 1)); + dealloc(x, Layout::from_size_align_unchecked(1, 2)); } } diff --git a/tests/compile-fail/deallocate-bad-size.rs b/tests/compile-fail/deallocate-bad-size.rs index 498a662518e5..39a0d48c8b1a 100644 --- a/tests/compile-fail/deallocate-bad-size.rs +++ b/tests/compile-fail/deallocate-bad-size.rs @@ -1,15 +1,10 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; // 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)); } } diff --git a/tests/compile-fail/deallocate-twice.rs b/tests/compile-fail/deallocate-twice.rs index a851d75b9d5c..3c5e8e96360c 100644 --- a/tests/compile-fail/deallocate-twice.rs +++ b/tests/compile-fail/deallocate-twice.rs @@ -1,16 +1,11 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; // error-pattern: dereferenced after this allocation got freed fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; - Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); - Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); + let x = alloc(Layout::from_size_align_unchecked(1, 1)); + dealloc(x, Layout::from_size_align_unchecked(1, 1)); + dealloc(x, Layout::from_size_align_unchecked(1, 1)); } } diff --git a/tests/compile-fail/reallocate-bad-size.rs b/tests/compile-fail/reallocate-bad-size.rs index a62c1adae7e6..bbdef4421b6c 100644 --- a/tests/compile-fail/reallocate-bad-size.rs +++ b/tests/compile-fail/reallocate-bad-size.rs @@ -1,15 +1,10 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; // 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.realloc(x, Layout::from_size_align_unchecked(2, 1), 1).unwrap(); + let x = alloc(Layout::from_size_align_unchecked(1, 1)); + realloc(x, Layout::from_size_align_unchecked(2, 1), 1); } } diff --git a/tests/compile-fail/reallocate-change-alloc.rs b/tests/compile-fail/reallocate-change-alloc.rs index 0d4b60e0a336..8130d72dee59 100644 --- a/tests/compile-fail/reallocate-change-alloc.rs +++ b/tests/compile-fail/reallocate-change-alloc.rs @@ -1,14 +1,9 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; - Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap(); - let _z = *(x.as_ptr() as *mut u8); //~ ERROR dereferenced after this allocation got freed + let x = alloc(Layout::from_size_align_unchecked(1, 1)); + realloc(x, Layout::from_size_align_unchecked(1, 1), 1); + let _z = *x; //~ ERROR dereferenced after this allocation got freed } } diff --git a/tests/compile-fail/reallocate-dangling.rs b/tests/compile-fail/reallocate-dangling.rs index 9661d7e96674..702ddc0724a3 100644 --- a/tests/compile-fail/reallocate-dangling.rs +++ b/tests/compile-fail/reallocate-dangling.rs @@ -1,16 +1,11 @@ -#![feature(allocator_api)] - -extern crate alloc; - -use alloc::alloc::Global; -use std::alloc::{AllocRef, Layout}; +use std::alloc::{alloc, dealloc, realloc, Layout}; // error-pattern: dereferenced after this allocation got freed fn main() { unsafe { - let x = Global.alloc(Layout::from_size_align_unchecked(1, 1)).unwrap().0; - Global.dealloc(x, Layout::from_size_align_unchecked(1, 1)); - Global.realloc(x, Layout::from_size_align_unchecked(1, 1), 1).unwrap(); + let x = alloc(Layout::from_size_align_unchecked(1, 1)); + dealloc(x, Layout::from_size_align_unchecked(1, 1)); + realloc(x, Layout::from_size_align_unchecked(1, 1), 1); } }