From 9274b37d99f608e5fde569788ee79bd72fc3cf13 Mon Sep 17 00:00:00 2001
From: Tim Diekmann <tim.diekmann@3dvision.de>
Date: Fri, 4 Dec 2020 14:47:15 +0100
Subject:  Rename `AllocRef` to `Allocator` and `(de)alloc` to `(de)allocate`

---
 src/test/ui/error-codes/e0119/conflict-with-std.stderr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test/ui/error-codes')

diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.stderr b/src/test/ui/error-codes/e0119/conflict-with-std.stderr
index 9dc1a509cd0..68551f43775 100644
--- a/src/test/ui/error-codes/e0119/conflict-with-std.stderr
+++ b/src/test/ui/error-codes/e0119/conflict-with-std.stderr
@@ -6,7 +6,7 @@ LL | impl AsRef<Q> for Box<Q> {
    |
    = note: conflicting implementation in crate `alloc`:
            - impl<T, A> AsRef<T> for Box<T, A>
-             where A: AllocRef, T: ?Sized;
+             where A: Allocator, T: ?Sized;
 
 error[E0119]: conflicting implementations of trait `std::convert::From<S>` for type `S`:
   --> $DIR/conflict-with-std.rs:12:1
-- 
cgit 1.4.1-3-g733a5