about summary refs log tree commit diff
path: root/src/test/ui/allocator
diff options
context:
space:
mode:
authorTim Diekmann <tim.diekmann@3dvision.de>2020-01-23 01:49:29 +0100
committerTim Diekmann <tim.diekmann@3dvision.de>2020-01-27 21:39:51 +0100
commit7ca25db8162128808714f536fa993aefcf6a2239 (patch)
treeb0e326ad284fb34d208b59080a38e349a50687b0 /src/test/ui/allocator
parentc2d141df59703393c0c683abc259f9a8c3be041a (diff)
downloadrust-7ca25db8162128808714f536fa993aefcf6a2239.tar.gz
rust-7ca25db8162128808714f536fa993aefcf6a2239.zip
Rename `Alloc` to `AllocRef`
Diffstat (limited to 'src/test/ui/allocator')
-rw-r--r--src/test/ui/allocator/custom.rs2
-rw-r--r--src/test/ui/allocator/xcrate-use.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/allocator/custom.rs b/src/test/ui/allocator/custom.rs
index 71f72ae46c2..0b1f6d5a96e 100644
--- a/src/test/ui/allocator/custom.rs
+++ b/src/test/ui/allocator/custom.rs
@@ -7,7 +7,7 @@
 
 extern crate helper;
 
-use std::alloc::{self, Global, Alloc, System, Layout};
+use std::alloc::{self, Global, AllocRef, System, Layout};
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 static HITS: AtomicUsize = AtomicUsize::new(0);
diff --git a/src/test/ui/allocator/xcrate-use.rs b/src/test/ui/allocator/xcrate-use.rs
index 039c70e77be..37b28c195df 100644
--- a/src/test/ui/allocator/xcrate-use.rs
+++ b/src/test/ui/allocator/xcrate-use.rs
@@ -9,7 +9,7 @@
 extern crate custom;
 extern crate helper;
 
-use std::alloc::{Global, Alloc, System, Layout};
+use std::alloc::{Global, AllocRef, System, Layout};
 use std::sync::atomic::{Ordering, AtomicUsize};
 
 #[global_allocator]