Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

239 files changed, 39 insertions, 4 deletions

diff --git a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs b/tests/ui/coherence/auxiliary/coherence_copy_like_lib.rs
index b5b4802c1..b5b4802c1 100644
--- a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs b/tests/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
index 21aaea479..21aaea479 100644
--- a/src/test/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_fundamental_trait_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs b/tests/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
index 08d22fbed..08d22fbed 100644
--- a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_lib.rs b/tests/ui/coherence/auxiliary/coherence_lib.rs
index c22819831..c22819831 100644
--- a/src/test/ui/coherence/auxiliary/coherence_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs b/tests/ui/coherence/auxiliary/coherence_orphan_lib.rs
index 2664ef550..2664ef550 100644
--- a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs
+++ b/tests/ui/coherence/auxiliary/coherence_orphan_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/error_lib.rs b/tests/ui/coherence/auxiliary/error_lib.rs
index 19ff9ae62..19ff9ae62 100644
--- a/src/test/ui/coherence/auxiliary/error_lib.rs
+++ b/tests/ui/coherence/auxiliary/error_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/go_trait.rs b/tests/ui/coherence/auxiliary/go_trait.rs
index aa0ec2289..aa0ec2289 100644
--- a/src/test/ui/coherence/auxiliary/go_trait.rs
+++ b/tests/ui/coherence/auxiliary/go_trait.rs
diff --git a/src/test/ui/coherence/auxiliary/option_future.rs b/tests/ui/coherence/auxiliary/option_future.rs
index 067de1cd8..067de1cd8 100644
--- a/src/test/ui/coherence/auxiliary/option_future.rs
+++ b/tests/ui/coherence/auxiliary/option_future.rs
diff --git a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
index 9a191bad8..9a191bad8 100644
--- a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
+++ b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
diff --git a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
index 41b9d64d5..41b9d64d5 100644
--- a/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
+++ b/tests/ui/coherence/auxiliary/re_rebalance_coherence_lib.rs
diff --git a/src/test/ui/coherence/auxiliary/trait-with-const-param.rs b/tests/ui/coherence/auxiliary/trait-with-const-param.rs
index a44eb14f8..a44eb14f8 100644
--- a/src/test/ui/coherence/auxiliary/trait-with-const-param.rs
+++ b/tests/ui/coherence/auxiliary/trait-with-const-param.rs
diff --git a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs b/tests/ui/coherence/auxiliary/trait_impl_conflict.rs
index 5e5f017ed..5e5f017ed 100644
--- a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs
+++ b/tests/ui/coherence/auxiliary/trait_impl_conflict.rs
diff --git a/src/test/ui/coherence/coherence-all-remote.rs b/tests/ui/coherence/coherence-all-remote.rs
index 5c3bfee82..5c3bfee82 100644
--- a/src/test/ui/coherence/coherence-all-remote.rs
+++ b/tests/ui/coherence/coherence-all-remote.rs
diff --git a/src/test/ui/coherence/coherence-all-remote.stderr b/tests/ui/coherence/coherence-all-remote.stderr
index 7eca41753..7eca41753 100644
--- a/src/test/ui/coherence/coherence-all-remote.stderr
+++ b/tests/ui/coherence/coherence-all-remote.stderr
diff --git a/src/test/ui/coherence/coherence-bigint-int.rs b/tests/ui/coherence/coherence-bigint-int.rs
index 02945e9da..02945e9da 100644
--- a/src/test/ui/coherence/coherence-bigint-int.rs
+++ b/tests/ui/coherence/coherence-bigint-int.rs
diff --git a/src/test/ui/coherence/coherence-bigint-param.rs b/tests/ui/coherence/coherence-bigint-param.rs
index c6543aaf6..c6543aaf6 100644
--- a/src/test/ui/coherence/coherence-bigint-param.rs
+++ b/tests/ui/coherence/coherence-bigint-param.rs
diff --git a/src/test/ui/coherence/coherence-bigint-param.stderr b/tests/ui/coherence/coherence-bigint-param.stderr
index e8d74c917..e8d74c917 100644
--- a/src/test/ui/coherence/coherence-bigint-param.stderr
+++ b/tests/ui/coherence/coherence-bigint-param.stderr
diff --git a/src/test/ui/coherence/coherence-bigint-vecint.rs b/tests/ui/coherence/coherence-bigint-vecint.rs
index a5dba90be..a5dba90be 100644
--- a/src/test/ui/coherence/coherence-bigint-vecint.rs
+++ b/tests/ui/coherence/coherence-bigint-vecint.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
index 93a4bc5fe..93a4bc5fe 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
index 9156972a1..9156972a1 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
index 950a08ff2..950a08ff2 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
index 8400968e1..8400968e1 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
index bccbac2ff..bccbac2ff 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
index 4d7872598..4d7872598 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
index 6a9db2173..6a9db2173 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
index c2a925213..c2a925213 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
index 02f9217da..02f9217da 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
index e1a5dffeb..e1a5dffeb 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.rs
index 5a562ff6a..5a562ff6a 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.rs
diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
index ba60a2ea9..ba60a2ea9 100644
--- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
+++ b/tests/ui/coherence/coherence-blanket-conflicts-with-specific.stderr
diff --git a/src/test/ui/coherence/coherence-blanket.rs b/tests/ui/coherence/coherence-blanket.rs
index 55fa89d75..55fa89d75 100644
--- a/src/test/ui/coherence/coherence-blanket.rs
+++ b/tests/ui/coherence/coherence-blanket.rs
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.rs
index 24b878927..24b878927 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
+++ b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.rs
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
index 2463f38a9..2463f38a9 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
+++ b/tests/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
diff --git a/src/test/ui/coherence/coherence-covered-type-parameter.rs b/tests/ui/coherence/coherence-covered-type-parameter.rs
index bb95c59d1..bb95c59d1 100644
--- a/src/test/ui/coherence/coherence-covered-type-parameter.rs
+++ b/tests/ui/coherence/coherence-covered-type-parameter.rs
diff --git a/src/test/ui/coherence/coherence-cow.re_a.stderr b/tests/ui/coherence/coherence-cow.re_a.stderr
index fe4b5b410..fe4b5b410 100644
--- a/src/test/ui/coherence/coherence-cow.re_a.stderr
+++ b/tests/ui/coherence/coherence-cow.re_a.stderr
diff --git a/src/test/ui/coherence/coherence-cow.re_b.stderr b/tests/ui/coherence/coherence-cow.re_b.stderr
index da4ede325..da4ede325 100644
--- a/src/test/ui/coherence/coherence-cow.re_b.stderr
+++ b/tests/ui/coherence/coherence-cow.re_b.stderr
diff --git a/src/test/ui/coherence/coherence-cow.re_c.stderr b/tests/ui/coherence/coherence-cow.re_c.stderr
index d1a20c0ca..d1a20c0ca 100644
--- a/src/test/ui/coherence/coherence-cow.re_c.stderr
+++ b/tests/ui/coherence/coherence-cow.re_c.stderr
diff --git a/src/test/ui/coherence/coherence-cow.rs b/tests/ui/coherence/coherence-cow.rs
index 86a8d0963..86a8d0963 100644
--- a/src/test/ui/coherence/coherence-cow.rs
+++ b/tests/ui/coherence/coherence-cow.rs
diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.rs b/tests/ui/coherence/coherence-cross-crate-conflict.rs
index 588630957..588630957 100644
--- a/src/test/ui/coherence/coherence-cross-crate-conflict.rs
+++ b/tests/ui/coherence/coherence-cross-crate-conflict.rs
diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr b/tests/ui/coherence/coherence-cross-crate-conflict.stderr
index 3d253d56a..3d253d56a 100644
--- a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr
+++ b/tests/ui/coherence/coherence-cross-crate-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-default-trait-impl.rs b/tests/ui/coherence/coherence-default-trait-impl.rs
index d57fb4777..d57fb4777 100644
--- a/src/test/ui/coherence/coherence-default-trait-impl.rs
+++ b/tests/ui/coherence/coherence-default-trait-impl.rs
diff --git a/src/test/ui/coherence/coherence-default-trait-impl.stderr b/tests/ui/coherence/coherence-default-trait-impl.stderr
index 632018782..7be5b92a7 100644
--- a/src/test/ui/coherence/coherence-default-trait-impl.stderr
+++ b/tests/ui/coherence/coherence-default-trait-impl.stderr
@@ -2,7 +2,7 @@ error[E0199]: implementing the trait `MySafeTrait` is not unsafe
   --> $DIR/coherence-default-trait-impl.rs:8:1
    |
 LL | unsafe impl MySafeTrait for Foo {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: remove `unsafe` from this trait implementation
    |
@@ -14,7 +14,7 @@ error[E0200]: the trait `MyUnsafeTrait` requires an `unsafe impl` declaration
   --> $DIR/coherence-default-trait-impl.rs:13:1
    |
 LL | impl MyUnsafeTrait for Foo {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the trait `MyUnsafeTrait` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
diff --git a/src/test/ui/coherence/coherence-error-suppression.rs b/tests/ui/coherence/coherence-error-suppression.rs
index 909214c1b..909214c1b 100644
--- a/src/test/ui/coherence/coherence-error-suppression.rs
+++ b/tests/ui/coherence/coherence-error-suppression.rs
diff --git a/src/test/ui/coherence/coherence-error-suppression.stderr b/tests/ui/coherence/coherence-error-suppression.stderr
index aadc80cb1..aadc80cb1 100644
--- a/src/test/ui/coherence/coherence-error-suppression.stderr
+++ b/tests/ui/coherence/coherence-error-suppression.stderr
diff --git a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.rs b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
index 99f805f7f..99f805f7f 100644
--- a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
+++ b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.rs
diff --git a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
index 7dabd97b9..7dabd97b9 100644
--- a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
+++ b/tests/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
diff --git a/src/test/ui/coherence/coherence-fn-implied-bounds.rs b/tests/ui/coherence/coherence-fn-implied-bounds.rs
index 4539af9a3..4539af9a3 100644
--- a/src/test/ui/coherence/coherence-fn-implied-bounds.rs
+++ b/tests/ui/coherence/coherence-fn-implied-bounds.rs
diff --git a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr b/tests/ui/coherence/coherence-fn-implied-bounds.stderr
index 201871204..201871204 100644
--- a/src/test/ui/coherence/coherence-fn-implied-bounds.stderr
+++ b/tests/ui/coherence/coherence-fn-implied-bounds.stderr
diff --git a/src/test/ui/coherence/coherence-fn-inputs.rs b/tests/ui/coherence/coherence-fn-inputs.rs
index 3afec5c54..3afec5c54 100644
--- a/src/test/ui/coherence/coherence-fn-inputs.rs
+++ b/tests/ui/coherence/coherence-fn-inputs.rs
diff --git a/src/test/ui/coherence/coherence-fn-inputs.stderr b/tests/ui/coherence/coherence-fn-inputs.stderr
index 82bd8a35f..82bd8a35f 100644
--- a/src/test/ui/coherence/coherence-fn-inputs.stderr
+++ b/tests/ui/coherence/coherence-fn-inputs.stderr
diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.rs b/tests/ui/coherence/coherence-free-vs-bound-region.rs
index 2f5c49d29..2f5c49d29 100644
--- a/src/test/ui/coherence/coherence-free-vs-bound-region.rs
+++ b/tests/ui/coherence/coherence-free-vs-bound-region.rs
diff --git a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr b/tests/ui/coherence/coherence-free-vs-bound-region.stderr
index e2d84b833..e2d84b833 100644
--- a/src/test/ui/coherence/coherence-free-vs-bound-region.stderr
+++ b/tests/ui/coherence/coherence-free-vs-bound-region.stderr
diff --git a/src/test/ui/coherence/coherence-fundamental-trait-objects.rs b/tests/ui/coherence/coherence-fundamental-trait-objects.rs
index dd127bf7f..dd127bf7f 100644
--- a/src/test/ui/coherence/coherence-fundamental-trait-objects.rs
+++ b/tests/ui/coherence/coherence-fundamental-trait-objects.rs
diff --git a/src/test/ui/coherence/coherence-fundamental-trait-objects.stderr b/tests/ui/coherence/coherence-fundamental-trait-objects.stderr
index a35a95ef4..a35a95ef4 100644
--- a/src/test/ui/coherence/coherence-fundamental-trait-objects.stderr
+++ b/tests/ui/coherence/coherence-fundamental-trait-objects.stderr
diff --git a/src/test/ui/coherence/coherence-impl-in-fn.rs b/tests/ui/coherence/coherence-impl-in-fn.rs
index b97197317..b97197317 100644
--- a/src/test/ui/coherence/coherence-impl-in-fn.rs
+++ b/tests/ui/coherence/coherence-impl-in-fn.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
index 50d9a480a..50d9a480a 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
index c364c707f..c364c707f 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-negative.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
index faac6d983..faac6d983 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
index b80429794..b80429794 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-marker-trait-positive.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
index 20ff87549..20ff87549 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
index e9090c1b6..e9090c1b6 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs b/tests/ui/coherence/coherence-impl-trait-for-trait.rs
index 195a37f15..195a37f15 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait.rs
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr b/tests/ui/coherence/coherence-impl-trait-for-trait.stderr
index cf0b38c5b..cf0b38c5b 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr
+++ b/tests/ui/coherence/coherence-impl-trait-for-trait.stderr
diff --git a/src/test/ui/coherence/coherence-impls-copy.rs b/tests/ui/coherence/coherence-impls-copy.rs
index 4204fecc3..4204fecc3 100644
--- a/src/test/ui/coherence/coherence-impls-copy.rs
+++ b/tests/ui/coherence/coherence-impls-copy.rs
diff --git a/src/test/ui/coherence/coherence-impls-copy.stderr b/tests/ui/coherence/coherence-impls-copy.stderr
index d40ffc48a..d40ffc48a 100644
--- a/src/test/ui/coherence/coherence-impls-copy.stderr
+++ b/tests/ui/coherence/coherence-impls-copy.stderr
diff --git a/src/test/ui/coherence/coherence-impls-send.rs b/tests/ui/coherence/coherence-impls-send.rs
index b7b57c602..b7b57c602 100644
--- a/src/test/ui/coherence/coherence-impls-send.rs
+++ b/tests/ui/coherence/coherence-impls-send.rs
diff --git a/src/test/ui/coherence/coherence-impls-send.stderr b/tests/ui/coherence/coherence-impls-send.stderr
index e1071846e..e1071846e 100644
--- a/src/test/ui/coherence/coherence-impls-send.stderr
+++ b/tests/ui/coherence/coherence-impls-send.stderr
diff --git a/src/test/ui/coherence/coherence-impls-sized.rs b/tests/ui/coherence/coherence-impls-sized.rs
index 231b96ad4..231b96ad4 100644
--- a/src/test/ui/coherence/coherence-impls-sized.rs
+++ b/tests/ui/coherence/coherence-impls-sized.rs
diff --git a/src/test/ui/coherence/coherence-impls-sized.stderr b/tests/ui/coherence/coherence-impls-sized.stderr
index 17a754452..17a754452 100644
--- a/src/test/ui/coherence/coherence-impls-sized.stderr
+++ b/tests/ui/coherence/coherence-impls-sized.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
index d74d3a2a5..d74d3a2a5 100644
--- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
+++ b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs
diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
index 7bd50649d..7bd50649d 100644
--- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
+++ b/tests/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr b/tests/ui/coherence/coherence-inherited-subtyping.old.stderr
index 4701bc0b1..4701bc0b1 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr
+++ b/tests/ui/coherence/coherence-inherited-subtyping.old.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr b/tests/ui/coherence/coherence-inherited-subtyping.re.stderr
index 4701bc0b1..4701bc0b1 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr
+++ b/tests/ui/coherence/coherence-inherited-subtyping.re.stderr
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.rs b/tests/ui/coherence/coherence-inherited-subtyping.rs
index 8587eb779..8587eb779 100644
--- a/src/test/ui/coherence/coherence-inherited-subtyping.rs
+++ b/tests/ui/coherence/coherence-inherited-subtyping.rs
diff --git a/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs
index 43a0a5c42..43a0a5c42 100644
--- a/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs
+++ b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs
diff --git a/src/test/ui/coherence/coherence-iterator-vec.rs b/tests/ui/coherence/coherence-iterator-vec.rs
index 386fe40ac..386fe40ac 100644
--- a/src/test/ui/coherence/coherence-iterator-vec.rs
+++ b/tests/ui/coherence/coherence-iterator-vec.rs
diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.rs b/tests/ui/coherence/coherence-lone-type-parameter.rs
index 5368fef76..5368fef76 100644
--- a/src/test/ui/coherence/coherence-lone-type-parameter.rs
+++ b/tests/ui/coherence/coherence-lone-type-parameter.rs
diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.stderr b/tests/ui/coherence/coherence-lone-type-parameter.stderr
index ef5b08836..ef5b08836 100644
--- a/src/test/ui/coherence/coherence-lone-type-parameter.stderr
+++ b/tests/ui/coherence/coherence-lone-type-parameter.stderr
diff --git a/src/test/ui/coherence/coherence-multidispatch-tuple.rs b/tests/ui/coherence/coherence-multidispatch-tuple.rs
index fa1d4bbb4..fa1d4bbb4 100644
--- a/src/test/ui/coherence/coherence-multidispatch-tuple.rs
+++ b/tests/ui/coherence/coherence-multidispatch-tuple.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy-bad.rs b/tests/ui/coherence/coherence-negative-impls-copy-bad.rs
index 563f28e22..563f28e22 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy-bad.rs
+++ b/tests/ui/coherence/coherence-negative-impls-copy-bad.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy-bad.stderr b/tests/ui/coherence/coherence-negative-impls-copy-bad.stderr
index 2295d6315..2295d6315 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy-bad.stderr
+++ b/tests/ui/coherence/coherence-negative-impls-copy-bad.stderr
diff --git a/src/test/ui/coherence/coherence-negative-impls-copy.rs b/tests/ui/coherence/coherence-negative-impls-copy.rs
index 7b29aade4..7b29aade4 100644
--- a/src/test/ui/coherence/coherence-negative-impls-copy.rs
+++ b/tests/ui/coherence/coherence-negative-impls-copy.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs
index b87e162ac..b87e162ac 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
+++ b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.rs b/tests/ui/coherence/coherence-negative-impls-safe.rs
index 4821aa6b5..4821aa6b5 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe.rs
+++ b/tests/ui/coherence/coherence-negative-impls-safe.rs
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.stderr b/tests/ui/coherence/coherence-negative-impls-safe.stderr
index 1bd37f395..1bd37f395 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe.stderr
+++ b/tests/ui/coherence/coherence-negative-impls-safe.stderr
diff --git a/src/test/ui/coherence/coherence-negative-inherent-where-bounds.rs b/tests/ui/coherence/coherence-negative-inherent-where-bounds.rs
index 39ccaa6ac..39ccaa6ac 100644
--- a/src/test/ui/coherence/coherence-negative-inherent-where-bounds.rs
+++ b/tests/ui/coherence/coherence-negative-inherent-where-bounds.rs
diff --git a/src/test/ui/coherence/coherence-negative-inherent.rs b/tests/ui/coherence/coherence-negative-inherent.rs
index a9e1acc80..a9e1acc80 100644
--- a/src/test/ui/coherence/coherence-negative-inherent.rs
+++ b/tests/ui/coherence/coherence-negative-inherent.rs
diff --git a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.rs b/tests/ui/coherence/coherence-negative-outlives-lifetimes.rs
index 3acf0d8d3..3acf0d8d3 100644
--- a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.rs
+++ b/tests/ui/coherence/coherence-negative-outlives-lifetimes.rs
diff --git a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr b/tests/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
index 097cc4e0f..097cc4e0f 100644
--- a/src/test/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
+++ b/tests/ui/coherence/coherence-negative-outlives-lifetimes.stock.stderr
diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
index d466dcac1..d466dcac1 100644
--- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
+++ b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.rs
diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
index 8a43ad7b7..8a43ad7b7 100644
--- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
+++ b/tests/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr
diff --git a/src/test/ui/coherence/coherence-orphan.rs b/tests/ui/coherence/coherence-orphan.rs
index 3beac04c7..3beac04c7 100644
--- a/src/test/ui/coherence/coherence-orphan.rs
+++ b/tests/ui/coherence/coherence-orphan.rs
diff --git a/src/test/ui/coherence/coherence-orphan.stderr b/tests/ui/coherence/coherence-orphan.stderr
index 01f166a21..01f166a21 100644
--- a/src/test/ui/coherence/coherence-orphan.stderr
+++ b/tests/ui/coherence/coherence-orphan.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.rs
index 574a16a19..574a16a19 100644
--- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs
+++ b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.rs
diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
index 6a0880334..6a0880334 100644
--- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
+++ b/tests/ui/coherence/coherence-overlap-all-t-and-tuple.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-double-negative.rs b/tests/ui/coherence/coherence-overlap-double-negative.rs
index 1ea0ddc74..1ea0ddc74 100644
--- a/src/test/ui/coherence/coherence-overlap-double-negative.rs
+++ b/tests/ui/coherence/coherence-overlap-double-negative.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs b/tests/ui/coherence/coherence-overlap-downstream-inherent.rs
index 5dea33e33..5dea33e33 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-downstream-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr b/tests/ui/coherence/coherence-overlap-downstream-inherent.stderr
index bbce4b530..bbce4b530 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-downstream-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-downstream.rs b/tests/ui/coherence/coherence-overlap-downstream.rs
index 738ec0e3d..738ec0e3d 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream.rs
+++ b/tests/ui/coherence/coherence-overlap-downstream.rs
diff --git a/src/test/ui/coherence/coherence-overlap-downstream.stderr b/tests/ui/coherence/coherence-overlap-downstream.stderr
index 7f373e595..7f373e595 100644
--- a/src/test/ui/coherence/coherence-overlap-downstream.stderr
+++ b/tests/ui/coherence/coherence-overlap-downstream.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs
index a272e620f..a272e620f 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
index 3ad818cbc..3ad818cbc 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.rs b/tests/ui/coherence/coherence-overlap-issue-23516.rs
index 63e42e8f4..63e42e8f4 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516.rs
+++ b/tests/ui/coherence/coherence-overlap-issue-23516.rs
diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr b/tests/ui/coherence/coherence-overlap-issue-23516.stderr
index cd3984267..cd3984267 100644
--- a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr
+++ b/tests/ui/coherence/coherence-overlap-issue-23516.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-messages.rs b/tests/ui/coherence/coherence-overlap-messages.rs
index 1258a2371..1258a2371 100644
--- a/src/test/ui/coherence/coherence-overlap-messages.rs
+++ b/tests/ui/coherence/coherence-overlap-messages.rs
diff --git a/src/test/ui/coherence/coherence-overlap-messages.stderr b/tests/ui/coherence/coherence-overlap-messages.stderr
index 5a97296ee..5a97296ee 100644
--- a/src/test/ui/coherence/coherence-overlap-messages.stderr
+++ b/tests/ui/coherence/coherence-overlap-messages.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-negate-alias-strict.rs b/tests/ui/coherence/coherence-overlap-negate-alias-strict.rs
index 48dffc921..48dffc921 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-alias-strict.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-alias-strict.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
index a067736f6..a067736f6 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
index 4b55001ec..4b55001ec 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
+++ b/tests/ui/coherence/coherence-overlap-negate-not-use-feature-gate.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-negate-strict.rs b/tests/ui/coherence/coherence-overlap-negate-strict.rs
index 1021d87ca..1021d87ca 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-strict.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-strict.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negate-use-feature-gate.rs b/tests/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
index a0dd881d1..a0dd881d1 100644
--- a/src/test/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
+++ b/tests/ui/coherence/coherence-overlap-negate-use-feature-gate.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait.rs b/tests/ui/coherence/coherence-overlap-negative-trait.rs
index 8059d23ff..8059d23ff 100644
--- a/src/test/ui/coherence/coherence-overlap-negative-trait.rs
+++ b/tests/ui/coherence/coherence-overlap-negative-trait.rs
diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs b/tests/ui/coherence/coherence-overlap-negative-trait2.rs
index cc8c463b8..cc8c463b8 100644
--- a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs
+++ b/tests/ui/coherence/coherence-overlap-negative-trait2.rs
diff --git a/src/test/ui/coherence/coherence-overlap-super-negative.rs b/tests/ui/coherence/coherence-overlap-super-negative.rs
index d296a094a..d296a094a 100644
--- a/src/test/ui/coherence/coherence-overlap-super-negative.rs
+++ b/tests/ui/coherence/coherence-overlap-super-negative.rs
diff --git a/src/test/ui/coherence/coherence-overlap-trait-alias.rs b/tests/ui/coherence/coherence-overlap-trait-alias.rs
index 9d9c76af9..9d9c76af9 100644
--- a/src/test/ui/coherence/coherence-overlap-trait-alias.rs
+++ b/tests/ui/coherence/coherence-overlap-trait-alias.rs
diff --git a/src/test/ui/coherence/coherence-overlap-trait-alias.stderr b/tests/ui/coherence/coherence-overlap-trait-alias.stderr
index e324c1e79..668b8319b 100644
--- a/src/test/ui/coherence/coherence-overlap-trait-alias.stderr
+++ b/tests/ui/coherence/coherence-overlap-trait-alias.stderr
@@ -1,8 +1,8 @@
 error[E0283]: type annotations needed: cannot satisfy `u32: C`
-  --> $DIR/coherence-overlap-trait-alias.rs:15:6
+  --> $DIR/coherence-overlap-trait-alias.rs:15:12
    |
 LL | impl C for u32 {}
-   |      ^
+   |            ^^^
    |
 note: multiple `impl`s satisfying `u32: C` found
   --> $DIR/coherence-overlap-trait-alias.rs:14:1
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
index 082d753de..082d753de 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs
+++ b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr b/tests/ui/coherence/coherence-overlap-upstream-inherent.stderr
index f355c6e85..f355c6e85 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr
+++ b/tests/ui/coherence/coherence-overlap-upstream-inherent.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.rs b/tests/ui/coherence/coherence-overlap-upstream.rs
index 8f1e6558b..8f1e6558b 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream.rs
+++ b/tests/ui/coherence/coherence-overlap-upstream.rs
diff --git a/src/test/ui/coherence/coherence-overlap-upstream.stderr b/tests/ui/coherence/coherence-overlap-upstream.stderr
index f6145c188..f6145c188 100644
--- a/src/test/ui/coherence/coherence-overlap-upstream.stderr
+++ b/tests/ui/coherence/coherence-overlap-upstream.stderr
diff --git a/src/test/ui/coherence/coherence-overlap-with-regions.rs b/tests/ui/coherence/coherence-overlap-with-regions.rs
index 32f01f418..32f01f418 100644
--- a/src/test/ui/coherence/coherence-overlap-with-regions.rs
+++ b/tests/ui/coherence/coherence-overlap-with-regions.rs
diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.rs b/tests/ui/coherence/coherence-overlapping-pairs.rs
index d5d18217b..d5d18217b 100644
--- a/src/test/ui/coherence/coherence-overlapping-pairs.rs
+++ b/tests/ui/coherence/coherence-overlapping-pairs.rs
diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.stderr b/tests/ui/coherence/coherence-overlapping-pairs.stderr
index 15c92dfeb..15c92dfeb 100644
--- a/src/test/ui/coherence/coherence-overlapping-pairs.stderr
+++ b/tests/ui/coherence/coherence-overlapping-pairs.stderr
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs b/tests/ui/coherence/coherence-pair-covered-uncovered-1.rs
index 15868ca86..15868ca86 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered-1.rs
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr b/tests/ui/coherence/coherence-pair-covered-uncovered-1.stderr
index 03d787123..03d787123 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered-1.stderr
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs b/tests/ui/coherence/coherence-pair-covered-uncovered.rs
index da970572f..da970572f 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered.rs
diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr b/tests/ui/coherence/coherence-pair-covered-uncovered.stderr
index 73dfe2f57..73dfe2f57 100644
--- a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr
+++ b/tests/ui/coherence/coherence-pair-covered-uncovered.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs b/tests/ui/coherence/coherence-projection-conflict-orphan.rs
index 637dd2506..637dd2506 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
+++ b/tests/ui/coherence/coherence-projection-conflict-orphan.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr b/tests/ui/coherence/coherence-projection-conflict-orphan.stderr
index b1ee0795b..b1ee0795b 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict-orphan.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs b/tests/ui/coherence/coherence-projection-conflict-ty-param.rs
index 3e4141fa8..3e4141fa8 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs
+++ b/tests/ui/coherence/coherence-projection-conflict-ty-param.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr b/tests/ui/coherence/coherence-projection-conflict-ty-param.stderr
index 94d242eaa..94d242eaa 100644
--- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict-ty-param.stderr
diff --git a/src/test/ui/coherence/coherence-projection-conflict.rs b/tests/ui/coherence/coherence-projection-conflict.rs
index daab2a2f8..daab2a2f8 100644
--- a/src/test/ui/coherence/coherence-projection-conflict.rs
+++ b/tests/ui/coherence/coherence-projection-conflict.rs
diff --git a/src/test/ui/coherence/coherence-projection-conflict.stderr b/tests/ui/coherence/coherence-projection-conflict.stderr
index 7d2c584c3..7d2c584c3 100644
--- a/src/test/ui/coherence/coherence-projection-conflict.stderr
+++ b/tests/ui/coherence/coherence-projection-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-projection-ok-orphan.rs b/tests/ui/coherence/coherence-projection-ok-orphan.rs
index 42b4b1912..42b4b1912 100644
--- a/src/test/ui/coherence/coherence-projection-ok-orphan.rs
+++ b/tests/ui/coherence/coherence-projection-ok-orphan.rs
diff --git a/src/test/ui/coherence/coherence-projection-ok.rs b/tests/ui/coherence/coherence-projection-ok.rs
index 44fc02a5c..44fc02a5c 100644
--- a/src/test/ui/coherence/coherence-projection-ok.rs
+++ b/tests/ui/coherence/coherence-projection-ok.rs
diff --git a/src/test/ui/coherence/coherence-rfc447-constrained.rs b/tests/ui/coherence/coherence-rfc447-constrained.rs
index 9d1d86883..9d1d86883 100644
--- a/src/test/ui/coherence/coherence-rfc447-constrained.rs
+++ b/tests/ui/coherence/coherence-rfc447-constrained.rs
diff --git a/src/test/ui/coherence/coherence-subtyping.rs b/tests/ui/coherence/coherence-subtyping.rs
index b3ed728a8..b3ed728a8 100644
--- a/src/test/ui/coherence/coherence-subtyping.rs
+++ b/tests/ui/coherence/coherence-subtyping.rs
diff --git a/src/test/ui/coherence/coherence-subtyping.stderr b/tests/ui/coherence/coherence-subtyping.stderr
index 9d90019a5..9d90019a5 100644
--- a/src/test/ui/coherence/coherence-subtyping.stderr
+++ b/tests/ui/coherence/coherence-subtyping.stderr
diff --git a/src/test/ui/coherence/coherence-tuple-conflict.rs b/tests/ui/coherence/coherence-tuple-conflict.rs
index 8cc829726..8cc829726 100644
--- a/src/test/ui/coherence/coherence-tuple-conflict.rs
+++ b/tests/ui/coherence/coherence-tuple-conflict.rs
diff --git a/src/test/ui/coherence/coherence-tuple-conflict.stderr b/tests/ui/coherence/coherence-tuple-conflict.stderr
index 09ad5e5b2..09ad5e5b2 100644
--- a/src/test/ui/coherence/coherence-tuple-conflict.stderr
+++ b/tests/ui/coherence/coherence-tuple-conflict.stderr
diff --git a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.rs b/tests/ui/coherence/coherence-unsafe-trait-object-impl.rs
index 9859a226e..9859a226e 100644
--- a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.rs
+++ b/tests/ui/coherence/coherence-unsafe-trait-object-impl.rs
diff --git a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.stderr b/tests/ui/coherence/coherence-unsafe-trait-object-impl.stderr
index 2e2dac288..2e2dac288 100644
--- a/src/test/ui/coherence/coherence-unsafe-trait-object-impl.stderr
+++ b/tests/ui/coherence/coherence-unsafe-trait-object-impl.stderr
diff --git a/src/test/ui/coherence/coherence-vec-local-2.rs b/tests/ui/coherence/coherence-vec-local-2.rs
index 47df06bac..47df06bac 100644
--- a/src/test/ui/coherence/coherence-vec-local-2.rs
+++ b/tests/ui/coherence/coherence-vec-local-2.rs
diff --git a/src/test/ui/coherence/coherence-vec-local-2.stderr b/tests/ui/coherence/coherence-vec-local-2.stderr
index 95fdf172e..95fdf172e 100644
--- a/src/test/ui/coherence/coherence-vec-local-2.stderr
+++ b/tests/ui/coherence/coherence-vec-local-2.stderr
diff --git a/src/test/ui/coherence/coherence-vec-local.rs b/tests/ui/coherence/coherence-vec-local.rs
index 130cc39d0..130cc39d0 100644
--- a/src/test/ui/coherence/coherence-vec-local.rs
+++ b/tests/ui/coherence/coherence-vec-local.rs
diff --git a/src/test/ui/coherence/coherence-vec-local.stderr b/tests/ui/coherence/coherence-vec-local.stderr
index 4835e771a..4835e771a 100644
--- a/src/test/ui/coherence/coherence-vec-local.stderr
+++ b/tests/ui/coherence/coherence-vec-local.stderr
diff --git a/src/test/ui/coherence/coherence-wasm-bindgen.rs b/tests/ui/coherence/coherence-wasm-bindgen.rs
index ee09a7244..ee09a7244 100644
--- a/src/test/ui/coherence/coherence-wasm-bindgen.rs
+++ b/tests/ui/coherence/coherence-wasm-bindgen.rs
diff --git a/src/test/ui/coherence/coherence-wasm-bindgen.stderr b/tests/ui/coherence/coherence-wasm-bindgen.stderr
index 89615f0fb..89615f0fb 100644
--- a/src/test/ui/coherence/coherence-wasm-bindgen.stderr
+++ b/tests/ui/coherence/coherence-wasm-bindgen.stderr
diff --git a/src/test/ui/coherence/coherence-where-clause.rs b/tests/ui/coherence/coherence-where-clause.rs
index 5c40def86..5c40def86 100644
--- a/src/test/ui/coherence/coherence-where-clause.rs
+++ b/tests/ui/coherence/coherence-where-clause.rs
diff --git a/src/test/ui/coherence/coherence-with-closure.rs b/tests/ui/coherence/coherence-with-closure.rs
index 5b6a62b24..5b6a62b24 100644
--- a/src/test/ui/coherence/coherence-with-closure.rs
+++ b/tests/ui/coherence/coherence-with-closure.rs
diff --git a/src/test/ui/coherence/coherence-with-closure.stderr b/tests/ui/coherence/coherence-with-closure.stderr
index 431108e14..431108e14 100644
--- a/src/test/ui/coherence/coherence-with-closure.stderr
+++ b/tests/ui/coherence/coherence-with-closure.stderr
diff --git a/tests/ui/coherence/coherence-with-generator.rs b/tests/ui/coherence/coherence-with-generator.rs
new file mode 100644
index 000000000..5eb8dc2a4
--- /dev/null
+++ b/tests/ui/coherence/coherence-with-generator.rs
@@ -0,0 +1,24 @@
+// Test that encountering closures during coherence does not cause issues.
+#![feature(type_alias_impl_trait, generators)]
+#![cfg_attr(specialized, feature(specialization))]
+#![allow(incomplete_features)]
+
+// revisions: stock specialized
+// [specialized]check-pass
+
+type OpaqueGenerator = impl Sized;
+fn defining_use() -> OpaqueGenerator {
+    || {
+        for i in 0..10 {
+            yield i;
+        }
+    }
+}
+
+struct Wrapper<T>(T);
+trait Trait {}
+impl Trait for Wrapper<OpaqueGenerator> {}
+impl<T: Sync> Trait for Wrapper<T> {}
+//[stock]~^ ERROR conflicting implementations of trait `Trait` for type `Wrapper<OpaqueGenerator>`
+
+fn main() {}
diff --git a/tests/ui/coherence/coherence-with-generator.stock.stderr b/tests/ui/coherence/coherence-with-generator.stock.stderr
new file mode 100644
index 000000000..478ac4912
--- /dev/null
+++ b/tests/ui/coherence/coherence-with-generator.stock.stderr
@@ -0,0 +1,11 @@
+error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<OpaqueGenerator>`
+  --> $DIR/coherence-with-generator.rs:21:1
+   |
+LL | impl Trait for Wrapper<OpaqueGenerator> {}
+   | --------------------------------------- first implementation here
+LL | impl<T: Sync> Trait for Wrapper<T> {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<OpaqueGenerator>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/coherence/coherence_copy_like.rs b/tests/ui/coherence/coherence_copy_like.rs
index 92af341cc..92af341cc 100644
--- a/src/test/ui/coherence/coherence_copy_like.rs
+++ b/tests/ui/coherence/coherence_copy_like.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
index edee6cd7b..edee6cd7b 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
index 599c804d2..599c804d2 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
index 7d851b528..7d851b528 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
index 93486fa5f..93486fa5f 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.rs b/tests/ui/coherence/coherence_copy_like_err_struct.rs
index fe39370c9..fe39370c9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_struct.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_struct.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr b/tests/ui/coherence/coherence_copy_like_err_struct.stderr
index 7432733b9..7432733b9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_struct.stderr
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs b/tests/ui/coherence/coherence_copy_like_err_tuple.rs
index f63e205c9..f63e205c9 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs
+++ b/tests/ui/coherence/coherence_copy_like_err_tuple.rs
diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr b/tests/ui/coherence/coherence_copy_like_err_tuple.stderr
index 090497ec1..090497ec1 100644
--- a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr
+++ b/tests/ui/coherence/coherence_copy_like_err_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_inherent.rs b/tests/ui/coherence/coherence_inherent.rs
index f3ebf0003..f3ebf0003 100644
--- a/src/test/ui/coherence/coherence_inherent.rs
+++ b/tests/ui/coherence/coherence_inherent.rs
diff --git a/src/test/ui/coherence/coherence_inherent.stderr b/tests/ui/coherence/coherence_inherent.stderr
index 46b128c08..46b128c08 100644
--- a/src/test/ui/coherence/coherence_inherent.stderr
+++ b/tests/ui/coherence/coherence_inherent.stderr
diff --git a/src/test/ui/coherence/coherence_inherent_cc.rs b/tests/ui/coherence/coherence_inherent_cc.rs
index 759ada248..759ada248 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.rs
+++ b/tests/ui/coherence/coherence_inherent_cc.rs
diff --git a/src/test/ui/coherence/coherence_inherent_cc.stderr b/tests/ui/coherence/coherence_inherent_cc.stderr
index af0ef3b69..af0ef3b69 100644
--- a/src/test/ui/coherence/coherence_inherent_cc.stderr
+++ b/tests/ui/coherence/coherence_inherent_cc.stderr
diff --git a/src/test/ui/coherence/coherence_local.rs b/tests/ui/coherence/coherence_local.rs
index ea724ada7..ea724ada7 100644
--- a/src/test/ui/coherence/coherence_local.rs
+++ b/tests/ui/coherence/coherence_local.rs
diff --git a/src/test/ui/coherence/coherence_local_err_struct.rs b/tests/ui/coherence/coherence_local_err_struct.rs
index a24038eb2..a24038eb2 100644
--- a/src/test/ui/coherence/coherence_local_err_struct.rs
+++ b/tests/ui/coherence/coherence_local_err_struct.rs
diff --git a/src/test/ui/coherence/coherence_local_err_struct.stderr b/tests/ui/coherence/coherence_local_err_struct.stderr
index afc6fc45d..afc6fc45d 100644
--- a/src/test/ui/coherence/coherence_local_err_struct.stderr
+++ b/tests/ui/coherence/coherence_local_err_struct.stderr
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.rs b/tests/ui/coherence/coherence_local_err_tuple.rs
index f4033862a..f4033862a 100644
--- a/src/test/ui/coherence/coherence_local_err_tuple.rs
+++ b/tests/ui/coherence/coherence_local_err_tuple.rs
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.stderr b/tests/ui/coherence/coherence_local_err_tuple.stderr
index a4953859f..a4953859f 100644
--- a/src/test/ui/coherence/coherence_local_err_tuple.stderr
+++ b/tests/ui/coherence/coherence_local_err_tuple.stderr
diff --git a/src/test/ui/coherence/coherence_local_ref.rs b/tests/ui/coherence/coherence_local_ref.rs
index 2e28839c8..2e28839c8 100644
--- a/src/test/ui/coherence/coherence_local_ref.rs
+++ b/tests/ui/coherence/coherence_local_ref.rs
diff --git a/src/test/ui/coherence/conflicting-impl-with-err.rs b/tests/ui/coherence/conflicting-impl-with-err.rs
index 3e0234b87..3e0234b87 100644
--- a/src/test/ui/coherence/conflicting-impl-with-err.rs
+++ b/tests/ui/coherence/conflicting-impl-with-err.rs
diff --git a/src/test/ui/coherence/conflicting-impl-with-err.stderr b/tests/ui/coherence/conflicting-impl-with-err.stderr
index 3009b452d..3009b452d 100644
--- a/src/test/ui/coherence/conflicting-impl-with-err.stderr
+++ b/tests/ui/coherence/conflicting-impl-with-err.stderr
diff --git a/src/test/ui/coherence/const-generics-orphan-check-ok.rs b/tests/ui/coherence/const-generics-orphan-check-ok.rs
index 217e8aed2..217e8aed2 100644
--- a/src/test/ui/coherence/const-generics-orphan-check-ok.rs
+++ b/tests/ui/coherence/const-generics-orphan-check-ok.rs
diff --git a/src/test/ui/coherence/deep-bad-copy-reason.rs b/tests/ui/coherence/deep-bad-copy-reason.rs
index 80bbe387a..80bbe387a 100644
--- a/src/test/ui/coherence/deep-bad-copy-reason.rs
+++ b/tests/ui/coherence/deep-bad-copy-reason.rs
diff --git a/src/test/ui/coherence/deep-bad-copy-reason.stderr b/tests/ui/coherence/deep-bad-copy-reason.stderr
index 168ee5726..168ee5726 100644
--- a/src/test/ui/coherence/deep-bad-copy-reason.stderr
+++ b/tests/ui/coherence/deep-bad-copy-reason.stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign.rs b/tests/ui/coherence/impl-foreign-for-foreign.rs
index 4c0d46045..4c0d46045 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign.stderr b/tests/ui/coherence/impl-foreign-for-foreign.stderr
index 93f7a6fdc..93f7a6fdc 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].rs b/tests/ui/coherence/impl-foreign-for-foreign[foreign].rs
index e79f66c0e..e79f66c0e 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].stderr b/tests/ui/coherence/impl-foreign-for-foreign[foreign].stderr
index e24537bce..e24537bce 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[foreign].stderr
+++ b/tests/ui/coherence/impl-foreign-for-foreign[foreign].stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-foreign[local].rs b/tests/ui/coherence/impl-foreign-for-foreign[local].rs
index 0b1413edf..0b1413edf 100644
--- a/src/test/ui/coherence/impl-foreign-for-foreign[local].rs
+++ b/tests/ui/coherence/impl-foreign-for-foreign[local].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].rs b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].rs
index 10bdf2db8..10bdf2db8 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
index 55ea4409e..55ea4409e 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[local].rs b/tests/ui/coherence/impl-foreign-for-fundamental[local].rs
index c3fc0e6b8..c3fc0e6b8 100644
--- a/src/test/ui/coherence/impl-foreign-for-fundamental[local].rs
+++ b/tests/ui/coherence/impl-foreign-for-fundamental[local].rs
diff --git a/src/test/ui/coherence/impl-foreign-for-local.rs b/tests/ui/coherence/impl-foreign-for-local.rs
index 04405bc46..04405bc46 100644
--- a/src/test/ui/coherence/impl-foreign-for-local.rs
+++ b/tests/ui/coherence/impl-foreign-for-local.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
index bc1e18b65..bc1e18b65 100644
--- a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
+++ b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental.rs
diff --git a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
index 1e11789ef..1e11789ef 100644
--- a/src/test/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
+++ b/tests/ui/coherence/impl-foreign-for-locally-defined-fundamental[foreign].rs
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.rs b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.rs
index 99a399ddc..99a399ddc 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.stderr b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
index 65b3aa394..65b3aa394 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign[foreign]-for-local.rs b/tests/ui/coherence/impl-foreign[foreign]-for-local.rs
index bc6595bb3..bc6595bb3 100644
--- a/src/test/ui/coherence/impl-foreign[foreign]-for-local.rs
+++ b/tests/ui/coherence/impl-foreign[foreign]-for-local.rs
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
index 0476cdaff..0476cdaff 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
index 8e77c13e1..8e77c13e1 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
+++ b/tests/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs b/tests/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
index 7b83b0485..7b83b0485 100644
--- a/src/test/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
+++ b/tests/ui/coherence/impl-foreign[fundemental[local]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].rs
index 5282de4b2..5282de4b2 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].stderr b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
index 92346c291..92346c291 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign-for-foreign[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
index 6f5605a21..6f5605a21 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
index 249a5c44c..249a5c44c 100644
--- a/src/test/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
index 99f3ce447..99f3ce447 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign[t]_local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
index 81044cd05..81044cd05 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
index 95a20cc5b..95a20cc5b 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
index 680ba9f22..680ba9f22 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
index aed184767..aed184767 100644
--- a/src/test/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[foreign]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
index fc7649085..fc7649085 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
index 73b1e2c6e..73b1e2c6e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
index 703f25dd6..703f25dd6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
index 5f89a7aa4..5f89a7aa4 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
index ec21fdd4e..ec21fdd4e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
index 5bdab87bf..5bdab87bf 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
index 45559d8b6..45559d8b6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
index c9e3594cd..c9e3594cd 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
index f94f04c8d..f94f04c8d 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
index 62e69357e..62e69357e 100644
--- a/src/test/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[fundemental[local]]-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
index 1fec19bba..1fec19bba 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
index c8ed28be6..c8ed28be6 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-foreign[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
index f9b88c645..f9b88c645 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[foreign[t]].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
index 7709bd9c8..7709bd9c8 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
index e68f2fe58..e68f2fe58 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-local.rs
index 9c14eea1b..9c14eea1b 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[local]-for-t.rs
index eed3a4b5c..eed3a4b5c 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[local]-for-t.stderr
index d97e85dcb..d97e85dcb 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[local]-for-t.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
index 63c342b76..63c342b76 100644
--- a/src/test/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[local_fundamental[t]]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
index 9bb37c2ba..9bb37c2ba 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
index 44e3b7eed..44e3b7eed 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-foreign.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
index 79b5aa3fc..79b5aa3fc 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
index 80fb5dbec..80fb5dbec 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-fundamental.stderr
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-local.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-local.rs
index bc59721c0..bc59721c0 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-local.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-local.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.rs b/tests/ui/coherence/impl[t]-foreign[t]-for-t.rs
index bcd6b269a..bcd6b269a 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.rs
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-t.rs
diff --git a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.stderr b/tests/ui/coherence/impl[t]-foreign[t]-for-t.stderr
index ff72969dc..ff72969dc 100644
--- a/src/test/ui/coherence/impl[t]-foreign[t]-for-t.stderr
+++ b/tests/ui/coherence/impl[t]-foreign[t]-for-t.stderr
diff --git a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.rs b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs
index 5b11c78ab..5b11c78ab 100644
--- a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.rs
+++ b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs
diff --git a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.stderr b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
index 4ddd712b2..4ddd712b2 100644
--- a/src/test/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
+++ b/tests/ui/coherence/inter-crate-ambiguity-causes-notes.stderr
diff --git a/src/test/ui/coherence/issue-85026.rs b/tests/ui/coherence/issue-85026.rs
index 8b116545a..8b116545a 100644
--- a/src/test/ui/coherence/issue-85026.rs
+++ b/tests/ui/coherence/issue-85026.rs
diff --git a/src/test/ui/coherence/issue-85026.stderr b/tests/ui/coherence/issue-85026.stderr
index a5da19bbf..a5da19bbf 100644
--- a/src/test/ui/coherence/issue-85026.stderr
+++ b/tests/ui/coherence/issue-85026.stderr
diff --git a/src/test/ui/coherence/issue-99663-2.rs b/tests/ui/coherence/issue-99663-2.rs
index 10a0a5688..10a0a5688 100644
--- a/src/test/ui/coherence/issue-99663-2.rs
+++ b/tests/ui/coherence/issue-99663-2.rs
diff --git a/src/test/ui/coherence/issue-99663.rs b/tests/ui/coherence/issue-99663.rs
index a2d4d398c..a2d4d398c 100644
--- a/src/test/ui/coherence/issue-99663.rs
+++ b/tests/ui/coherence/issue-99663.rs
diff --git a/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs b/tests/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
index d18e3f453..d18e3f453 100644
--- a/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
+++ b/tests/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
diff --git a/src/test/ui/coherence/re-rebalance-coherence.rs b/tests/ui/coherence/re-rebalance-coherence.rs
index 38d096b08..38d096b08 100644
--- a/src/test/ui/coherence/re-rebalance-coherence.rs
+++ b/tests/ui/coherence/re-rebalance-coherence.rs
diff --git a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.rs b/tests/ui/coherence/strict-coherence-needs-negative-coherence.rs
index 221683dd5..221683dd5 100644
--- a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.rs
+++ b/tests/ui/coherence/strict-coherence-needs-negative-coherence.rs
diff --git a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.stderr b/tests/ui/coherence/strict-coherence-needs-negative-coherence.stderr
index b54729287..b54729287 100644
--- a/src/test/ui/coherence/strict-coherence-needs-negative-coherence.stderr
+++ b/tests/ui/coherence/strict-coherence-needs-negative-coherence.stderr