diff options
| author | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-12-04 14:47:15 +0100 |
|---|---|---|
| committer | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-12-04 14:47:15 +0100 |
| commit | 9274b37d99f608e5fde569788ee79bd72fc3cf13 (patch) | |
| tree | c42beb7089a4aea6d915167c837ab075a0f9d4ae /src/test/ui/error-codes | |
| parent | e6225434fff7d493baac0aa91c57f2da923ea196 (diff) | |
| download | rust-9274b37d99f608e5fde569788ee79bd72fc3cf13.tar.gz rust-9274b37d99f608e5fde569788ee79bd72fc3cf13.zip | |
Rename `AllocRef` to `Allocator` and `(de)alloc` to `(de)allocate`
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/e0119/conflict-with-std.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
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 |