Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

117 files changed, 15 insertions, 0 deletions

diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr b/tests/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
index 0ec0d4be5..0ec0d4be5 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr b/tests/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
index b494b448e..b494b448e 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.rs b/tests/ui/self/arbitrary-self-types-not-object-safe.rs
index 40e8df339..40e8df339 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.rs
+++ b/tests/ui/self/arbitrary-self-types-not-object-safe.rs
diff --git a/src/test/ui/self/arbitrary_self_types_nested.rs b/tests/ui/self/arbitrary_self_types_nested.rs
index 680196fbb..680196fbb 100644
--- a/src/test/ui/self/arbitrary_self_types_nested.rs
+++ b/tests/ui/self/arbitrary_self_types_nested.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime-async.rs
index f3474bc1f..f3474bc1f 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime.rs
index 300201388..300201388 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
index a1e7f4aa8..a1e7f4aa8 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
index eb3d3e4a6..eb3d3e4a6 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
index 4db2fa7dc..4db2fa7dc 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
index 2c0b2a0d9..2c0b2a0d9 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
index a2b7f0805..a2b7f0805 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
index 6180e1e0f..6180e1e0f 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
index f1a3fb018..f1a3fb018 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
index fccee5d43..fccee5d43 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
+++ b/tests/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
diff --git a/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs b/tests/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
index 65fec3bec..65fec3bec 100644
--- a/src/test/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
+++ b/tests/ui/self/arbitrary_self_types_pointers_and_wrappers.rs
diff --git a/src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs b/tests/ui/self/arbitrary_self_types_raw_pointer_struct.rs
index 0eab7617f..0eab7617f 100644
--- a/src/test/ui/self/arbitrary_self_types_raw_pointer_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_raw_pointer_struct.rs
diff --git a/src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs b/tests/ui/self/arbitrary_self_types_raw_pointer_trait.rs
index 0a9370e6f..0a9370e6f 100644
--- a/src/test/ui/self/arbitrary_self_types_raw_pointer_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_raw_pointer_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_silly.rs b/tests/ui/self/arbitrary_self_types_silly.rs
index fb5f9012b..fb5f9012b 100644
--- a/src/test/ui/self/arbitrary_self_types_silly.rs
+++ b/tests/ui/self/arbitrary_self_types_silly.rs
diff --git a/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs b/tests/ui/self/arbitrary_self_types_stdlib_pointers.rs
index 29563fbbd..29563fbbd 100644
--- a/src/test/ui/self/arbitrary_self_types_stdlib_pointers.rs
+++ b/tests/ui/self/arbitrary_self_types_stdlib_pointers.rs
diff --git a/src/test/ui/self/arbitrary_self_types_struct.rs b/tests/ui/self/arbitrary_self_types_struct.rs
index 905ad83b6..905ad83b6 100644
--- a/src/test/ui/self/arbitrary_self_types_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_struct.rs
diff --git a/src/test/ui/self/arbitrary_self_types_trait.rs b/tests/ui/self/arbitrary_self_types_trait.rs
index 973c7cae8..973c7cae8 100644
--- a/src/test/ui/self/arbitrary_self_types_trait.rs
+++ b/tests/ui/self/arbitrary_self_types_trait.rs
diff --git a/src/test/ui/self/arbitrary_self_types_unsized_struct.rs b/tests/ui/self/arbitrary_self_types_unsized_struct.rs
index d43f31328..d43f31328 100644
--- a/src/test/ui/self/arbitrary_self_types_unsized_struct.rs
+++ b/tests/ui/self/arbitrary_self_types_unsized_struct.rs
diff --git a/src/test/ui/self/auxiliary/explicit_self_xcrate.rs b/tests/ui/self/auxiliary/explicit_self_xcrate.rs
index 25cdfa909..25cdfa909 100644
--- a/src/test/ui/self/auxiliary/explicit_self_xcrate.rs
+++ b/tests/ui/self/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/ui/self/builtin-superkinds-self-type.rs b/tests/ui/self/builtin-superkinds-self-type.rs
index c56542bb4..c56542bb4 100644
--- a/src/test/ui/self/builtin-superkinds-self-type.rs
+++ b/tests/ui/self/builtin-superkinds-self-type.rs
diff --git a/src/test/ui/self/by-value-self-in-mut-slot.rs b/tests/ui/self/by-value-self-in-mut-slot.rs
index 267afd1dc..267afd1dc 100644
--- a/src/test/ui/self/by-value-self-in-mut-slot.rs
+++ b/tests/ui/self/by-value-self-in-mut-slot.rs
diff --git a/src/test/ui/self/class-missing-self.rs b/tests/ui/self/class-missing-self.rs
index 8ad347d20..8ad347d20 100644
--- a/src/test/ui/self/class-missing-self.rs
+++ b/tests/ui/self/class-missing-self.rs
diff --git a/src/test/ui/self/class-missing-self.stderr b/tests/ui/self/class-missing-self.stderr
index 063c3f013..063c3f013 100644
--- a/src/test/ui/self/class-missing-self.stderr
+++ b/tests/ui/self/class-missing-self.stderr
diff --git a/src/test/ui/self/elision/README.md b/tests/ui/self/elision/README.md
index 3bd7a6c00..3bd7a6c00 100644
--- a/src/test/ui/self/elision/README.md
+++ b/tests/ui/self/elision/README.md
diff --git a/src/test/ui/self/elision/alias-async.rs b/tests/ui/self/elision/alias-async.rs
index 7c0dd0686..7c0dd0686 100644
--- a/src/test/ui/self/elision/alias-async.rs
+++ b/tests/ui/self/elision/alias-async.rs
diff --git a/src/test/ui/self/elision/alias.rs b/tests/ui/self/elision/alias.rs
index 0c801d702..0c801d702 100644
--- a/src/test/ui/self/elision/alias.rs
+++ b/tests/ui/self/elision/alias.rs
diff --git a/src/test/ui/self/elision/assoc-async.rs b/tests/ui/self/elision/assoc-async.rs
index 363b7fc2a..363b7fc2a 100644
--- a/src/test/ui/self/elision/assoc-async.rs
+++ b/tests/ui/self/elision/assoc-async.rs
diff --git a/src/test/ui/self/elision/assoc.rs b/tests/ui/self/elision/assoc.rs
index fa39a2b47..fa39a2b47 100644
--- a/src/test/ui/self/elision/assoc.rs
+++ b/tests/ui/self/elision/assoc.rs
diff --git a/src/test/ui/self/elision/lt-alias-async.rs b/tests/ui/self/elision/lt-alias-async.rs
index 3a6f8471e..3a6f8471e 100644
--- a/src/test/ui/self/elision/lt-alias-async.rs
+++ b/tests/ui/self/elision/lt-alias-async.rs
diff --git a/src/test/ui/self/elision/lt-alias.rs b/tests/ui/self/elision/lt-alias.rs
index bbba88e4e..bbba88e4e 100644
--- a/src/test/ui/self/elision/lt-alias.rs
+++ b/tests/ui/self/elision/lt-alias.rs
diff --git a/src/test/ui/self/elision/lt-assoc-async.rs b/tests/ui/self/elision/lt-assoc-async.rs
index 0d3ff630d..0d3ff630d 100644
--- a/src/test/ui/self/elision/lt-assoc-async.rs
+++ b/tests/ui/self/elision/lt-assoc-async.rs
diff --git a/src/test/ui/self/elision/lt-assoc.rs b/tests/ui/self/elision/lt-assoc.rs
index 8f3543135..8f3543135 100644
--- a/src/test/ui/self/elision/lt-assoc.rs
+++ b/tests/ui/self/elision/lt-assoc.rs
diff --git a/src/test/ui/self/elision/lt-ref-self-async.rs b/tests/ui/self/elision/lt-ref-self-async.rs
index a2325ba7f..a2325ba7f 100644
--- a/src/test/ui/self/elision/lt-ref-self-async.rs
+++ b/tests/ui/self/elision/lt-ref-self-async.rs
diff --git a/src/test/ui/self/elision/lt-ref-self-async.stderr b/tests/ui/self/elision/lt-ref-self-async.stderr
index 787afd4dc..787afd4dc 100644
--- a/src/test/ui/self/elision/lt-ref-self-async.stderr
+++ b/tests/ui/self/elision/lt-ref-self-async.stderr
diff --git a/src/test/ui/self/elision/lt-ref-self.rs b/tests/ui/self/elision/lt-ref-self.rs
index d37ed5acb..d37ed5acb 100644
--- a/src/test/ui/self/elision/lt-ref-self.rs
+++ b/tests/ui/self/elision/lt-ref-self.rs
diff --git a/src/test/ui/self/elision/lt-ref-self.stderr b/tests/ui/self/elision/lt-ref-self.stderr
index 49af638e4..49af638e4 100644
--- a/src/test/ui/self/elision/lt-ref-self.stderr
+++ b/tests/ui/self/elision/lt-ref-self.stderr
diff --git a/src/test/ui/self/elision/lt-self-async.rs b/tests/ui/self/elision/lt-self-async.rs
index 4cedaf79d..4cedaf79d 100644
--- a/src/test/ui/self/elision/lt-self-async.rs
+++ b/tests/ui/self/elision/lt-self-async.rs
diff --git a/src/test/ui/self/elision/lt-self.rs b/tests/ui/self/elision/lt-self.rs
index cf74f892b..cf74f892b 100644
--- a/src/test/ui/self/elision/lt-self.rs
+++ b/tests/ui/self/elision/lt-self.rs
diff --git a/src/test/ui/self/elision/lt-struct-async.rs b/tests/ui/self/elision/lt-struct-async.rs
index abbee7fdf..abbee7fdf 100644
--- a/src/test/ui/self/elision/lt-struct-async.rs
+++ b/tests/ui/self/elision/lt-struct-async.rs
diff --git a/src/test/ui/self/elision/lt-struct.rs b/tests/ui/self/elision/lt-struct.rs
index 799c6c079..799c6c079 100644
--- a/src/test/ui/self/elision/lt-struct.rs
+++ b/tests/ui/self/elision/lt-struct.rs
diff --git a/src/test/ui/self/elision/multiple-ref-self-async.rs b/tests/ui/self/elision/multiple-ref-self-async.rs
index be073c6ed..be073c6ed 100644
--- a/src/test/ui/self/elision/multiple-ref-self-async.rs
+++ b/tests/ui/self/elision/multiple-ref-self-async.rs
diff --git a/src/test/ui/self/elision/multiple-ref-self.rs b/tests/ui/self/elision/multiple-ref-self.rs
index f39613d0c..f39613d0c 100644
--- a/src/test/ui/self/elision/multiple-ref-self.rs
+++ b/tests/ui/self/elision/multiple-ref-self.rs
diff --git a/src/test/ui/self/elision/ref-alias-async.rs b/tests/ui/self/elision/ref-alias-async.rs
index 15f16525b..15f16525b 100644
--- a/src/test/ui/self/elision/ref-alias-async.rs
+++ b/tests/ui/self/elision/ref-alias-async.rs
diff --git a/src/test/ui/self/elision/ref-alias.rs b/tests/ui/self/elision/ref-alias.rs
index 341f5b52d..341f5b52d 100644
--- a/src/test/ui/self/elision/ref-alias.rs
+++ b/tests/ui/self/elision/ref-alias.rs
diff --git a/src/test/ui/self/elision/ref-assoc-async.rs b/tests/ui/self/elision/ref-assoc-async.rs
index ad10d8ba4..ad10d8ba4 100644
--- a/src/test/ui/self/elision/ref-assoc-async.rs
+++ b/tests/ui/self/elision/ref-assoc-async.rs
diff --git a/src/test/ui/self/elision/ref-assoc.rs b/tests/ui/self/elision/ref-assoc.rs
index 2f02cb5f3..2f02cb5f3 100644
--- a/src/test/ui/self/elision/ref-assoc.rs
+++ b/tests/ui/self/elision/ref-assoc.rs
diff --git a/src/test/ui/self/elision/ref-mut-alias-async.rs b/tests/ui/self/elision/ref-mut-alias-async.rs
index 2c3f971d2..2c3f971d2 100644
--- a/src/test/ui/self/elision/ref-mut-alias-async.rs
+++ b/tests/ui/self/elision/ref-mut-alias-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-alias.rs b/tests/ui/self/elision/ref-mut-alias.rs
index ce1ab3ffc..ce1ab3ffc 100644
--- a/src/test/ui/self/elision/ref-mut-alias.rs
+++ b/tests/ui/self/elision/ref-mut-alias.rs
diff --git a/src/test/ui/self/elision/ref-mut-self-async.rs b/tests/ui/self/elision/ref-mut-self-async.rs
index e07bc8564..e07bc8564 100644
--- a/src/test/ui/self/elision/ref-mut-self-async.rs
+++ b/tests/ui/self/elision/ref-mut-self-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-self-async.stderr b/tests/ui/self/elision/ref-mut-self-async.stderr
index dff50aee9..dff50aee9 100644
--- a/src/test/ui/self/elision/ref-mut-self-async.stderr
+++ b/tests/ui/self/elision/ref-mut-self-async.stderr
diff --git a/src/test/ui/self/elision/ref-mut-self.rs b/tests/ui/self/elision/ref-mut-self.rs
index bb82e6be7..bb82e6be7 100644
--- a/src/test/ui/self/elision/ref-mut-self.rs
+++ b/tests/ui/self/elision/ref-mut-self.rs
diff --git a/src/test/ui/self/elision/ref-mut-self.stderr b/tests/ui/self/elision/ref-mut-self.stderr
index ccf183016..ccf183016 100644
--- a/src/test/ui/self/elision/ref-mut-self.stderr
+++ b/tests/ui/self/elision/ref-mut-self.stderr
diff --git a/src/test/ui/self/elision/ref-mut-struct-async.rs b/tests/ui/self/elision/ref-mut-struct-async.rs
index 392bf1d6b..392bf1d6b 100644
--- a/src/test/ui/self/elision/ref-mut-struct-async.rs
+++ b/tests/ui/self/elision/ref-mut-struct-async.rs
diff --git a/src/test/ui/self/elision/ref-mut-struct-async.stderr b/tests/ui/self/elision/ref-mut-struct-async.stderr
index 5b7ad026f..5b7ad026f 100644
--- a/src/test/ui/self/elision/ref-mut-struct-async.stderr
+++ b/tests/ui/self/elision/ref-mut-struct-async.stderr
diff --git a/src/test/ui/self/elision/ref-mut-struct.rs b/tests/ui/self/elision/ref-mut-struct.rs
index ca8bd8da1..ca8bd8da1 100644
--- a/src/test/ui/self/elision/ref-mut-struct.rs
+++ b/tests/ui/self/elision/ref-mut-struct.rs
diff --git a/src/test/ui/self/elision/ref-mut-struct.stderr b/tests/ui/self/elision/ref-mut-struct.stderr
index b9c71e843..b9c71e843 100644
--- a/src/test/ui/self/elision/ref-mut-struct.stderr
+++ b/tests/ui/self/elision/ref-mut-struct.stderr
diff --git a/src/test/ui/self/elision/ref-self-async.rs b/tests/ui/self/elision/ref-self-async.rs
index b0133ec1b..b0133ec1b 100644
--- a/src/test/ui/self/elision/ref-self-async.rs
+++ b/tests/ui/self/elision/ref-self-async.rs
diff --git a/src/test/ui/self/elision/ref-self-async.stderr b/tests/ui/self/elision/ref-self-async.stderr
index 26ef9779b..26ef9779b 100644
--- a/src/test/ui/self/elision/ref-self-async.stderr
+++ b/tests/ui/self/elision/ref-self-async.stderr
diff --git a/src/test/ui/self/elision/ref-self.rs b/tests/ui/self/elision/ref-self.rs
index dd07fe1b0..dd07fe1b0 100644
--- a/src/test/ui/self/elision/ref-self.rs
+++ b/tests/ui/self/elision/ref-self.rs
diff --git a/src/test/ui/self/elision/ref-self.stderr b/tests/ui/self/elision/ref-self.stderr
index 32448f3a6..32448f3a6 100644
--- a/src/test/ui/self/elision/ref-self.stderr
+++ b/tests/ui/self/elision/ref-self.stderr
diff --git a/src/test/ui/self/elision/ref-struct-async.rs b/tests/ui/self/elision/ref-struct-async.rs
index 0be748745..0be748745 100644
--- a/src/test/ui/self/elision/ref-struct-async.rs
+++ b/tests/ui/self/elision/ref-struct-async.rs
diff --git a/src/test/ui/self/elision/ref-struct-async.stderr b/tests/ui/self/elision/ref-struct-async.stderr
index edb5c54ab..edb5c54ab 100644
--- a/src/test/ui/self/elision/ref-struct-async.stderr
+++ b/tests/ui/self/elision/ref-struct-async.stderr
diff --git a/src/test/ui/self/elision/ref-struct.rs b/tests/ui/self/elision/ref-struct.rs
index 13a42cd1a..13a42cd1a 100644
--- a/src/test/ui/self/elision/ref-struct.rs
+++ b/tests/ui/self/elision/ref-struct.rs
diff --git a/src/test/ui/self/elision/ref-struct.stderr b/tests/ui/self/elision/ref-struct.stderr
index 4492ed4aa..4492ed4aa 100644
--- a/src/test/ui/self/elision/ref-struct.stderr
+++ b/tests/ui/self/elision/ref-struct.stderr
diff --git a/src/test/ui/self/elision/self-async.rs b/tests/ui/self/elision/self-async.rs
index eb01cfc97..eb01cfc97 100644
--- a/src/test/ui/self/elision/self-async.rs
+++ b/tests/ui/self/elision/self-async.rs
diff --git a/src/test/ui/self/elision/self.rs b/tests/ui/self/elision/self.rs
index 574b7e7c9..574b7e7c9 100644
--- a/src/test/ui/self/elision/self.rs
+++ b/tests/ui/self/elision/self.rs
diff --git a/src/test/ui/self/elision/struct-async.rs b/tests/ui/self/elision/struct-async.rs
index e018e0daf..e018e0daf 100644
--- a/src/test/ui/self/elision/struct-async.rs
+++ b/tests/ui/self/elision/struct-async.rs
diff --git a/src/test/ui/self/elision/struct.rs b/tests/ui/self/elision/struct.rs
index d1ac99d13..d1ac99d13 100644
--- a/src/test/ui/self/elision/struct.rs
+++ b/tests/ui/self/elision/struct.rs
diff --git a/src/test/ui/self/explicit-self-closures.rs b/tests/ui/self/explicit-self-closures.rs
index b409dfd7a..b409dfd7a 100644
--- a/src/test/ui/self/explicit-self-closures.rs
+++ b/tests/ui/self/explicit-self-closures.rs
diff --git a/src/test/ui/self/explicit-self-generic.rs b/tests/ui/self/explicit-self-generic.rs
index 8f6bed3b0..8f6bed3b0 100644
--- a/src/test/ui/self/explicit-self-generic.rs
+++ b/tests/ui/self/explicit-self-generic.rs
diff --git a/src/test/ui/self/explicit-self-objects-uniq.rs b/tests/ui/self/explicit-self-objects-uniq.rs
index 250ea12e5..250ea12e5 100644
--- a/src/test/ui/self/explicit-self-objects-uniq.rs
+++ b/tests/ui/self/explicit-self-objects-uniq.rs
diff --git a/src/test/ui/self/explicit-self.rs b/tests/ui/self/explicit-self.rs
index 873c3621a..873c3621a 100644
--- a/src/test/ui/self/explicit-self.rs
+++ b/tests/ui/self/explicit-self.rs
diff --git a/src/test/ui/self/explicit_self_xcrate_exe.rs b/tests/ui/self/explicit_self_xcrate_exe.rs
index c3796f73a..c3796f73a 100644
--- a/src/test/ui/self/explicit_self_xcrate_exe.rs
+++ b/tests/ui/self/explicit_self_xcrate_exe.rs
diff --git a/src/test/ui/self/issue-61882-2.rs b/tests/ui/self/issue-61882-2.rs
index 1209b54bc..1209b54bc 100644
--- a/src/test/ui/self/issue-61882-2.rs
+++ b/tests/ui/self/issue-61882-2.rs
diff --git a/src/test/ui/self/issue-61882-2.stderr b/tests/ui/self/issue-61882-2.stderr
index 0b8e134c9..0b8e134c9 100644
--- a/src/test/ui/self/issue-61882-2.stderr
+++ b/tests/ui/self/issue-61882-2.stderr
diff --git a/src/test/ui/self/issue-61882.rs b/tests/ui/self/issue-61882.rs
index 013398b45..013398b45 100644
--- a/src/test/ui/self/issue-61882.rs
+++ b/tests/ui/self/issue-61882.rs
diff --git a/src/test/ui/self/issue-61882.stderr b/tests/ui/self/issue-61882.stderr
index dd7194dc2..dd7194dc2 100644
--- a/src/test/ui/self/issue-61882.stderr
+++ b/tests/ui/self/issue-61882.stderr
diff --git a/src/test/ui/self/move-self.rs b/tests/ui/self/move-self.rs
index 66032780b..66032780b 100644
--- a/src/test/ui/self/move-self.rs
+++ b/tests/ui/self/move-self.rs
diff --git a/src/test/ui/self/object-safety-sized-self-by-value-self.rs b/tests/ui/self/object-safety-sized-self-by-value-self.rs
index 43b1d8b91..43b1d8b91 100644
--- a/src/test/ui/self/object-safety-sized-self-by-value-self.rs
+++ b/tests/ui/self/object-safety-sized-self-by-value-self.rs
diff --git a/src/test/ui/self/object-safety-sized-self-generic-method.rs b/tests/ui/self/object-safety-sized-self-generic-method.rs
index e0b0526a3..e0b0526a3 100644
--- a/src/test/ui/self/object-safety-sized-self-generic-method.rs
+++ b/tests/ui/self/object-safety-sized-self-generic-method.rs
diff --git a/src/test/ui/self/object-safety-sized-self-return-Self.rs b/tests/ui/self/object-safety-sized-self-return-Self.rs
index 222c75439..222c75439 100644
--- a/src/test/ui/self/object-safety-sized-self-return-Self.rs
+++ b/tests/ui/self/object-safety-sized-self-return-Self.rs
diff --git a/src/test/ui/self/objects-owned-object-owned-method.rs b/tests/ui/self/objects-owned-object-owned-method.rs
index 15677a518..15677a518 100644
--- a/src/test/ui/self/objects-owned-object-owned-method.rs
+++ b/tests/ui/self/objects-owned-object-owned-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-method.rs b/tests/ui/self/point-at-arbitrary-self-type-method.rs
index 0f7deeaca..0f7deeaca 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-method.rs
+++ b/tests/ui/self/point-at-arbitrary-self-type-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr b/tests/ui/self/point-at-arbitrary-self-type-method.stderr
index 3c7cccfc9..3c7cccfc9 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-method.stderr
+++ b/tests/ui/self/point-at-arbitrary-self-type-method.stderr
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.rs b/tests/ui/self/point-at-arbitrary-self-type-trait-method.rs
index 53d992771..53d992771 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.rs
+++ b/tests/ui/self/point-at-arbitrary-self-type-trait-method.rs
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr b/tests/ui/self/point-at-arbitrary-self-type-trait-method.stderr
index 366c14f76..366c14f76 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
+++ b/tests/ui/self/point-at-arbitrary-self-type-trait-method.stderr
diff --git a/src/test/ui/self/self-impl-2.rs b/tests/ui/self/self-impl-2.rs
index 7eed3f056..7eed3f056 100644
--- a/src/test/ui/self/self-impl-2.rs
+++ b/tests/ui/self/self-impl-2.rs
diff --git a/src/test/ui/self/self-impl.rs b/tests/ui/self/self-impl.rs
index ed250ce52..ed250ce52 100644
--- a/src/test/ui/self/self-impl.rs
+++ b/tests/ui/self/self-impl.rs
diff --git a/tests/ui/self/self-impl.stderr b/tests/ui/self/self-impl.stderr
new file mode 100644
index 000000000..36372b644
--- /dev/null
+++ b/tests/ui/self/self-impl.stderr
@@ -0,0 +1,15 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/self-impl.rs:23:16
+   |
+LL |         let _: <Self>::Baz = true;
+   |                ^^^^^^^^^^^ help: use the fully-qualified path: `<Bar as Foo>::Baz`
+
+error[E0223]: ambiguous associated type
+  --> $DIR/self-impl.rs:25:16
+   |
+LL |         let _: Self::Baz = true;
+   |                ^^^^^^^^^ help: use the fully-qualified path: `<Bar as Foo>::Baz`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/self/self-in-mut-slot-default-method.rs b/tests/ui/self/self-in-mut-slot-default-method.rs
index 45e122c8d..45e122c8d 100644
--- a/src/test/ui/self/self-in-mut-slot-default-method.rs
+++ b/tests/ui/self/self-in-mut-slot-default-method.rs
diff --git a/src/test/ui/self/self-in-mut-slot-immediate-value.rs b/tests/ui/self/self-in-mut-slot-immediate-value.rs
index 60865304f..60865304f 100644
--- a/src/test/ui/self/self-in-mut-slot-immediate-value.rs
+++ b/tests/ui/self/self-in-mut-slot-immediate-value.rs
diff --git a/src/test/ui/self/self-in-typedefs.rs b/tests/ui/self/self-in-typedefs.rs
index 81e557d53..81e557d53 100644
--- a/src/test/ui/self/self-in-typedefs.rs
+++ b/tests/ui/self/self-in-typedefs.rs
diff --git a/src/test/ui/self/self-infer.rs b/tests/ui/self/self-infer.rs
index 9839b8880..9839b8880 100644
--- a/src/test/ui/self/self-infer.rs
+++ b/tests/ui/self/self-infer.rs
diff --git a/src/test/ui/self/self-infer.stderr b/tests/ui/self/self-infer.stderr
index 4f9e3f21d..4f9e3f21d 100644
--- a/src/test/ui/self/self-infer.stderr
+++ b/tests/ui/self/self-infer.stderr
diff --git a/src/test/ui/self/self-re-assign.rs b/tests/ui/self/self-re-assign.rs
index 9595ebf96..9595ebf96 100644
--- a/src/test/ui/self/self-re-assign.rs
+++ b/tests/ui/self/self-re-assign.rs
diff --git a/src/test/ui/self/self-shadowing-import.rs b/tests/ui/self/self-shadowing-import.rs
index 1d60c6c22..1d60c6c22 100644
--- a/src/test/ui/self/self-shadowing-import.rs
+++ b/tests/ui/self/self-shadowing-import.rs
diff --git a/src/test/ui/self/self-type-param.rs b/tests/ui/self/self-type-param.rs
index 5eb8c3622..5eb8c3622 100644
--- a/src/test/ui/self/self-type-param.rs
+++ b/tests/ui/self/self-type-param.rs
diff --git a/src/test/ui/self/self-vs-path-ambiguity.rs b/tests/ui/self/self-vs-path-ambiguity.rs
index 5a06d56c8..5a06d56c8 100644
--- a/src/test/ui/self/self-vs-path-ambiguity.rs
+++ b/tests/ui/self/self-vs-path-ambiguity.rs
diff --git a/src/test/ui/self/self-vs-path-ambiguity.stderr b/tests/ui/self/self-vs-path-ambiguity.stderr
index 2beef50cd..2beef50cd 100644
--- a/src/test/ui/self/self-vs-path-ambiguity.stderr
+++ b/tests/ui/self/self-vs-path-ambiguity.stderr
diff --git a/src/test/ui/self/self_lifetime-async.rs b/tests/ui/self/self_lifetime-async.rs
index c3c6e5658..c3c6e5658 100644
--- a/src/test/ui/self/self_lifetime-async.rs
+++ b/tests/ui/self/self_lifetime-async.rs
diff --git a/src/test/ui/self/self_lifetime.rs b/tests/ui/self/self_lifetime.rs
index f04bd83ab..f04bd83ab 100644
--- a/src/test/ui/self/self_lifetime.rs
+++ b/tests/ui/self/self_lifetime.rs
diff --git a/src/test/ui/self/self_type_keyword-2.rs b/tests/ui/self/self_type_keyword-2.rs
index cfb87f518..cfb87f518 100644
--- a/src/test/ui/self/self_type_keyword-2.rs
+++ b/tests/ui/self/self_type_keyword-2.rs
diff --git a/src/test/ui/self/self_type_keyword-2.stderr b/tests/ui/self/self_type_keyword-2.stderr
index 4e931f91f..4e931f91f 100644
--- a/src/test/ui/self/self_type_keyword-2.stderr
+++ b/tests/ui/self/self_type_keyword-2.stderr
diff --git a/src/test/ui/self/self_type_keyword.rs b/tests/ui/self/self_type_keyword.rs
index b42bf8eea..b42bf8eea 100644
--- a/src/test/ui/self/self_type_keyword.rs
+++ b/tests/ui/self/self_type_keyword.rs
diff --git a/src/test/ui/self/self_type_keyword.stderr b/tests/ui/self/self_type_keyword.stderr
index aca08d811..aca08d811 100644
--- a/src/test/ui/self/self_type_keyword.stderr
+++ b/tests/ui/self/self_type_keyword.stderr
diff --git a/src/test/ui/self/string-self-append.rs b/tests/ui/self/string-self-append.rs
index e63dc0090..e63dc0090 100644
--- a/src/test/ui/self/string-self-append.rs
+++ b/tests/ui/self/string-self-append.rs
diff --git a/src/test/ui/self/suggest-self-2.rs b/tests/ui/self/suggest-self-2.rs
index 1e001827e..1e001827e 100644
--- a/src/test/ui/self/suggest-self-2.rs
+++ b/tests/ui/self/suggest-self-2.rs
diff --git a/src/test/ui/self/suggest-self-2.stderr b/tests/ui/self/suggest-self-2.stderr
index 4bd025ea0..4bd025ea0 100644
--- a/src/test/ui/self/suggest-self-2.stderr
+++ b/tests/ui/self/suggest-self-2.stderr
diff --git a/src/test/ui/self/suggest-self.rs b/tests/ui/self/suggest-self.rs
index 1cc17116e..1cc17116e 100644
--- a/src/test/ui/self/suggest-self.rs
+++ b/tests/ui/self/suggest-self.rs
diff --git a/src/test/ui/self/suggest-self.stderr b/tests/ui/self/suggest-self.stderr
index 0d38b9d87..0d38b9d87 100644
--- a/src/test/ui/self/suggest-self.stderr
+++ b/tests/ui/self/suggest-self.stderr
diff --git a/src/test/ui/self/ufcs-explicit-self.rs b/tests/ui/self/ufcs-explicit-self.rs
index d83af14d3..d83af14d3 100644
--- a/src/test/ui/self/ufcs-explicit-self.rs
+++ b/tests/ui/self/ufcs-explicit-self.rs
diff --git a/src/test/ui/self/uniq-self-in-mut-slot.rs b/tests/ui/self/uniq-self-in-mut-slot.rs
index 71e57d8c1..71e57d8c1 100644
--- a/src/test/ui/self/uniq-self-in-mut-slot.rs
+++ b/tests/ui/self/uniq-self-in-mut-slot.rs
diff --git a/src/test/ui/self/where-for-self.rs b/tests/ui/self/where-for-self.rs
index 76c592dc4..76c592dc4 100644
--- a/src/test/ui/self/where-for-self.rs
+++ b/tests/ui/self/where-for-self.rs