101 files changed, 54 insertions, 13 deletions
diff --git a/tests/ui/wf/hir-wf-canonicalized.rs b/tests/ui/wf/hir-wf-canonicalized.rs
new file mode 100644
index 000000000..bdb84409d
--- /dev/null
+++ b/tests/ui/wf/hir-wf-canonicalized.rs
@@ -0,0 +1,18 @@
+// incremental
+
+trait Foo {
+    type V;
+}
+
+trait Callback<T: Foo>: Fn(&Bar<'_, T>, &T::V) {}
+
+struct Bar<'a, T> {
+    callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+    //~^ ERROR the trait bound `Bar<'a, T>: Foo` is not satisfied
+    //~| ERROR the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+    //~| ERROR the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+}
+
+impl<T: Foo> Bar<'_, Bar<'_, T>> {}
+
+fn main() {}
diff --git a/tests/ui/wf/hir-wf-canonicalized.stderr b/tests/ui/wf/hir-wf-canonicalized.stderr
new file mode 100644
index 000000000..9fd0f9c81
--- /dev/null
+++ b/tests/ui/wf/hir-wf-canonicalized.stderr
@@ -0,0 +1,32 @@
+error[E0277]: the trait bound `Bar<'a, T>: Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `Bar<'a, T>`
+
+error[E0277]: the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+
+error[E0277]: the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+note: required by a bound in `Bar`
+  --> $DIR/hir-wf-canonicalized.rs:9:16
+   |
+LL | struct Bar<'a, T> {
+   |                ^ required by this bound in `Bar`
+help: consider relaxing the implicit `Sized` restriction
+   |
+LL | struct Bar<'a, T: ?Sized> {
+   |                 ++++++++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/wf/hir-wf-check-erase-regions.rs b/tests/ui/wf/hir-wf-check-erase-regions.rs
index 2b4b480df..2b4b480df 100644
--- a/src/test/ui/wf/hir-wf-check-erase-regions.rs
+++ b/tests/ui/wf/hir-wf-check-erase-regions.rs
diff --git a/src/test/ui/wf/hir-wf-check-erase-regions.stderr b/tests/ui/wf/hir-wf-check-erase-regions.stderr
index b04588c57..7bc19dd2e 100644
--- a/src/test/ui/wf/hir-wf-check-erase-regions.stderr
+++ b/tests/ui/wf/hir-wf-check-erase-regions.stderr
@@ -9,9 +9,6 @@ LL |     type IntoIter = std::iter::Flatten<std::slice::Iter<'a, T>>;
    = note: required for `&T` to implement `IntoIterator`
 note: required by a bound in `Flatten`
   --> $SRC_DIR/core/src/iter/adapters/flatten.rs:LL:COL
-   |
-LL | pub struct Flatten<I: Iterator<Item: IntoIterator>> {
-   |                                      ^^^^^^^^^^^^ required by this bound in `Flatten`
 
 error[E0277]: `&T` is not an iterator
   --> $DIR/hir-wf-check-erase-regions.rs:10:27
@@ -24,9 +21,6 @@ LL |     fn into_iter(self) -> Self::IntoIter {
    = note: required for `&T` to implement `IntoIterator`
 note: required by a bound in `Flatten`
   --> $SRC_DIR/core/src/iter/adapters/flatten.rs:LL:COL
-   |
-LL | pub struct Flatten<I: Iterator<Item: IntoIterator>> {
-   |                                      ^^^^^^^^^^^^ required by this bound in `Flatten`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/wf/issue-103573.rs b/tests/ui/wf/issue-103573.rs
index bcbf4f941..bcbf4f941 100644
--- a/src/test/ui/wf/issue-103573.rs
+++ b/tests/ui/wf/issue-103573.rs
diff --git a/src/test/ui/wf/issue-103573.stderr b/tests/ui/wf/issue-103573.stderr
index fcf3f15e4..5227badb7 100644
--- a/src/test/ui/wf/issue-103573.stderr
+++ b/tests/ui/wf/issue-103573.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB: TraitA` is not satisfied
-  --> $DIR/issue-103573.rs:18:5
+  --> $DIR/issue-103573.rs:18:18
    |
 LL |     fn g<'a>(_: &<<Self::TypeC<'a> as TraitB>::TypeB as TraitA>::TypeA);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TraitA` is not implemented for `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB`
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TraitA` is not implemented for `<<Self as TraitC<E>>::TypeC<'a> as TraitB>::TypeB`
    |
 help: consider further restricting the associated type
    |
diff --git a/src/test/ui/wf/issue-48638.rs b/tests/ui/wf/issue-48638.rs
index f07843103..f07843103 100644
--- a/src/test/ui/wf/issue-48638.rs
+++ b/tests/ui/wf/issue-48638.rs
diff --git a/src/test/ui/wf/issue-87495.rs b/tests/ui/wf/issue-87495.rs
index 5aab74311..5aab74311 100644
--- a/src/test/ui/wf/issue-87495.rs
+++ b/tests/ui/wf/issue-87495.rs
diff --git a/src/test/ui/wf/issue-87495.stderr b/tests/ui/wf/issue-87495.stderr
index c924cd879..c924cd879 100644
--- a/src/test/ui/wf/issue-87495.stderr
+++ b/tests/ui/wf/issue-87495.stderr
diff --git a/src/test/ui/wf/issue-95665.rs b/tests/ui/wf/issue-95665.rs
index 67923cbb2..67923cbb2 100644
--- a/src/test/ui/wf/issue-95665.rs
+++ b/tests/ui/wf/issue-95665.rs
diff --git a/src/test/ui/wf/issue-95665.stderr b/tests/ui/wf/issue-95665.stderr
index b1cda59a9..b1cda59a9 100644
--- a/src/test/ui/wf/issue-95665.stderr
+++ b/tests/ui/wf/issue-95665.stderr
diff --git a/src/test/ui/wf/issue-96810.rs b/tests/ui/wf/issue-96810.rs
index c2948086b..c2948086b 100644
--- a/src/test/ui/wf/issue-96810.rs
+++ b/tests/ui/wf/issue-96810.rs
diff --git a/src/test/ui/wf/issue-96810.stderr b/tests/ui/wf/issue-96810.stderr
index 1407e62b1..1407e62b1 100644
--- a/src/test/ui/wf/issue-96810.stderr
+++ b/tests/ui/wf/issue-96810.stderr
diff --git a/src/test/ui/wf/wf-array-elem-sized.rs b/tests/ui/wf/wf-array-elem-sized.rs
index 34bf22034..34bf22034 100644
--- a/src/test/ui/wf/wf-array-elem-sized.rs
+++ b/tests/ui/wf/wf-array-elem-sized.rs
diff --git a/src/test/ui/wf/wf-array-elem-sized.stderr b/tests/ui/wf/wf-array-elem-sized.stderr
index 7f3c58d6b..7f3c58d6b 100644
--- a/src/test/ui/wf/wf-array-elem-sized.stderr
+++ b/tests/ui/wf/wf-array-elem-sized.stderr
diff --git a/src/test/ui/wf/wf-complex-assoc-type.rs b/tests/ui/wf/wf-complex-assoc-type.rs
index c3811e823..c3811e823 100644
--- a/src/test/ui/wf/wf-complex-assoc-type.rs
+++ b/tests/ui/wf/wf-complex-assoc-type.rs
diff --git a/src/test/ui/wf/wf-complex-assoc-type.stderr b/tests/ui/wf/wf-complex-assoc-type.stderr
index ef613e313..ef613e313 100644
--- a/src/test/ui/wf/wf-complex-assoc-type.stderr
+++ b/tests/ui/wf/wf-complex-assoc-type.stderr
diff --git a/src/test/ui/wf/wf-const-type.rs b/tests/ui/wf/wf-const-type.rs
index df79aa267..df79aa267 100644
--- a/src/test/ui/wf/wf-const-type.rs
+++ b/tests/ui/wf/wf-const-type.rs
diff --git a/src/test/ui/wf/wf-const-type.stderr b/tests/ui/wf/wf-const-type.stderr
index 85938364e..85938364e 100644
--- a/src/test/ui/wf/wf-const-type.stderr
+++ b/tests/ui/wf/wf-const-type.stderr
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.rs b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.rs
index ffdb49a3b..ffdb49a3b 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.rs
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.rs
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
index 6cf4f33f9..6cf4f33f9 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.rs b/tests/ui/wf/wf-convert-unsafe-trait-obj.rs
index 143b854ed..143b854ed 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj.rs
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj.rs
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr b/tests/ui/wf/wf-convert-unsafe-trait-obj.stderr
index c9bd4549a..c9bd4549a 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
+++ b/tests/ui/wf/wf-convert-unsafe-trait-obj.stderr
diff --git a/src/test/ui/wf/wf-enum-bound.rs b/tests/ui/wf/wf-enum-bound.rs
index 042a2cb09..042a2cb09 100644
--- a/src/test/ui/wf/wf-enum-bound.rs
+++ b/tests/ui/wf/wf-enum-bound.rs
diff --git a/src/test/ui/wf/wf-enum-bound.stderr b/tests/ui/wf/wf-enum-bound.stderr
index d39fc0c6a..d39fc0c6a 100644
--- a/src/test/ui/wf/wf-enum-bound.stderr
+++ b/tests/ui/wf/wf-enum-bound.stderr
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.rs b/tests/ui/wf/wf-enum-fields-struct-variant.rs
index c25622fa7..c25622fa7 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.rs
+++ b/tests/ui/wf/wf-enum-fields-struct-variant.rs
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr b/tests/ui/wf/wf-enum-fields-struct-variant.stderr
index c12d62521..c12d62521 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
+++ b/tests/ui/wf/wf-enum-fields-struct-variant.stderr
diff --git a/src/test/ui/wf/wf-enum-fields.rs b/tests/ui/wf/wf-enum-fields.rs
index a465ffe5e..a465ffe5e 100644
--- a/src/test/ui/wf/wf-enum-fields.rs
+++ b/tests/ui/wf/wf-enum-fields.rs
diff --git a/src/test/ui/wf/wf-enum-fields.stderr b/tests/ui/wf/wf-enum-fields.stderr
index ac3301a96..ac3301a96 100644
--- a/src/test/ui/wf/wf-enum-fields.stderr
+++ b/tests/ui/wf/wf-enum-fields.stderr
diff --git a/src/test/ui/wf/wf-fn-where-clause.rs b/tests/ui/wf/wf-fn-where-clause.rs
index adae53613..adae53613 100644
--- a/src/test/ui/wf/wf-fn-where-clause.rs
+++ b/tests/ui/wf/wf-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/tests/ui/wf/wf-fn-where-clause.stderr
index 2aec641e7..2aec641e7 100644
--- a/src/test/ui/wf/wf-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-foreign-fn-decl-ret.rs b/tests/ui/wf/wf-foreign-fn-decl-ret.rs
index b9d956c05..b9d956c05 100644
--- a/src/test/ui/wf/wf-foreign-fn-decl-ret.rs
+++ b/tests/ui/wf/wf-foreign-fn-decl-ret.rs
diff --git a/src/test/ui/wf/wf-foreign-fn-decl-ret.stderr b/tests/ui/wf/wf-foreign-fn-decl-ret.stderr
index 78312a091..b03023b5f 100644
--- a/src/test/ui/wf/wf-foreign-fn-decl-ret.stderr
+++ b/tests/ui/wf/wf-foreign-fn-decl-ret.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the trait bound `(): Foo` is not satisfied
-  --> $DIR/wf-foreign-fn-decl-ret.rs:11:5
+  --> $DIR/wf-foreign-fn-decl-ret.rs:11:25
    |
 LL |     pub fn lint_me() -> <() as Foo>::Assoc;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
+   |                         ^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `()`
 
 error[E0277]: the trait bound `u32: Unsatisfied` is not satisfied
   --> $DIR/wf-foreign-fn-decl-ret.rs:14:32
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.rs b/tests/ui/wf/wf-impl-associated-type-region.rs
index 1bf8d3663..1bf8d3663 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.rs
+++ b/tests/ui/wf/wf-impl-associated-type-region.rs
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.stderr b/tests/ui/wf/wf-impl-associated-type-region.stderr
index b9d4857a3..b9d4857a3 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.stderr
+++ b/tests/ui/wf/wf-impl-associated-type-region.stderr
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.rs b/tests/ui/wf/wf-impl-associated-type-trait.rs
index 84e628e21..84e628e21 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.rs
+++ b/tests/ui/wf/wf-impl-associated-type-trait.rs
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.stderr b/tests/ui/wf/wf-impl-associated-type-trait.stderr
index bdf8bba5e..bdf8bba5e 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.stderr
+++ b/tests/ui/wf/wf-impl-associated-type-trait.stderr
diff --git a/src/test/ui/wf/wf-impl-self-type.rs b/tests/ui/wf/wf-impl-self-type.rs
index 2dd9b4ef0..2dd9b4ef0 100644
--- a/src/test/ui/wf/wf-impl-self-type.rs
+++ b/tests/ui/wf/wf-impl-self-type.rs
diff --git a/src/test/ui/wf/wf-impl-self-type.stderr b/tests/ui/wf/wf-impl-self-type.stderr
index 371321793..1ca368729 100644
--- a/src/test/ui/wf/wf-impl-self-type.stderr
+++ b/tests/ui/wf/wf-impl-self-type.stderr
@@ -7,9 +7,6 @@ LL | impl Foo for Option<[u8]> {}
    = help: the trait `Sized` is not implemented for `[u8]`
 note: required by a bound in `Option`
   --> $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   |                 ^ required by this bound in `Option`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-arg.rs b/tests/ui/wf/wf-in-fn-arg.rs
index 18df72336..18df72336 100644
--- a/src/test/ui/wf/wf-in-fn-arg.rs
+++ b/tests/ui/wf/wf-in-fn-arg.rs
diff --git a/src/test/ui/wf/wf-in-fn-arg.stderr b/tests/ui/wf/wf-in-fn-arg.stderr
index 83a4a592a..83a4a592a 100644
--- a/src/test/ui/wf/wf-in-fn-arg.stderr
+++ b/tests/ui/wf/wf-in-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-in-fn-ret.rs b/tests/ui/wf/wf-in-fn-ret.rs
index 4c9535184..4c9535184 100644
--- a/src/test/ui/wf/wf-in-fn-ret.rs
+++ b/tests/ui/wf/wf-in-fn-ret.rs
diff --git a/src/test/ui/wf/wf-in-fn-ret.stderr b/tests/ui/wf/wf-in-fn-ret.stderr
index 7eeb97472..7eeb97472 100644
--- a/src/test/ui/wf/wf-in-fn-ret.stderr
+++ b/tests/ui/wf/wf-in-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.rs b/tests/ui/wf/wf-in-fn-type-arg.rs
index 2917a8aa9..2917a8aa9 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.rs
+++ b/tests/ui/wf/wf-in-fn-type-arg.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.stderr b/tests/ui/wf/wf-in-fn-type-arg.stderr
index be5e9d418..be5e9d418 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.stderr
+++ b/tests/ui/wf/wf-in-fn-type-arg.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.rs b/tests/ui/wf/wf-in-fn-type-ret.rs
index ab8e697e3..ab8e697e3 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.rs
+++ b/tests/ui/wf/wf-in-fn-type-ret.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.stderr b/tests/ui/wf/wf-in-fn-type-ret.stderr
index 8fcfcb0b2..8fcfcb0b2 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.stderr
+++ b/tests/ui/wf/wf-in-fn-type-ret.stderr
diff --git a/src/test/ui/wf/wf-in-fn-type-static.rs b/tests/ui/wf/wf-in-fn-type-static.rs
index 73071dd23..73071dd23 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.rs
+++ b/tests/ui/wf/wf-in-fn-type-static.rs
diff --git a/src/test/ui/wf/wf-in-fn-type-static.stderr b/tests/ui/wf/wf-in-fn-type-static.stderr
index 73fbb9ca6..73fbb9ca6 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.stderr
+++ b/tests/ui/wf/wf-in-fn-type-static.stderr
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.rs b/tests/ui/wf/wf-in-fn-where-clause.rs
index e55295a3b..e55295a3b 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.rs
+++ b/tests/ui/wf/wf-in-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.stderr b/tests/ui/wf/wf-in-fn-where-clause.stderr
index 160a73840..160a73840 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-in-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
index 4fcf8f403..4fcf8f403 100644
--- a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
+++ b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.rs
diff --git a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
index 94f6dc266..94f6dc266 100644
--- a/src/test/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
+++ b/tests/ui/wf/wf-in-foreign-fn-decls-issue-80468.stderr
diff --git a/src/test/ui/wf/wf-in-obj-type-static.rs b/tests/ui/wf/wf-in-obj-type-static.rs
index 1ad2fd1ed..1ad2fd1ed 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.rs
+++ b/tests/ui/wf/wf-in-obj-type-static.rs
diff --git a/src/test/ui/wf/wf-in-obj-type-static.stderr b/tests/ui/wf/wf-in-obj-type-static.stderr
index c3ad42dd5..c3ad42dd5 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.stderr
+++ b/tests/ui/wf/wf-in-obj-type-static.stderr
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.rs b/tests/ui/wf/wf-in-obj-type-trait.rs
index 170fad55f..170fad55f 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.rs
+++ b/tests/ui/wf/wf-in-obj-type-trait.rs
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.stderr b/tests/ui/wf/wf-in-obj-type-trait.stderr
index f556b678e..f556b678e 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.stderr
+++ b/tests/ui/wf/wf-in-obj-type-trait.stderr
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs b/tests/ui/wf/wf-inherent-impl-method-where-clause.rs
index eb50fc010..eb50fc010 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs
+++ b/tests/ui/wf/wf-inherent-impl-method-where-clause.rs
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr
index e723d1ba7..e723d1ba7 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
+++ b/tests/ui/wf/wf-inherent-impl-method-where-clause.stderr
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.rs b/tests/ui/wf/wf-inherent-impl-where-clause.rs
index ac194fb13..ac194fb13 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.rs
+++ b/tests/ui/wf/wf-inherent-impl-where-clause.rs
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr b/tests/ui/wf/wf-inherent-impl-where-clause.stderr
index 39e0d348e..39e0d348e 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
+++ b/tests/ui/wf/wf-inherent-impl-where-clause.stderr
diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.rs b/tests/ui/wf/wf-misc-methods-issue-28609.rs
index 050f866e1..050f866e1 100644
--- a/src/test/ui/wf/wf-misc-methods-issue-28609.rs
+++ b/tests/ui/wf/wf-misc-methods-issue-28609.rs
diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr b/tests/ui/wf/wf-misc-methods-issue-28609.stderr
index fc5898434..fc5898434 100644
--- a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr
+++ b/tests/ui/wf/wf-misc-methods-issue-28609.stderr
diff --git a/src/test/ui/wf/wf-object-safe.rs b/tests/ui/wf/wf-object-safe.rs
index 42e691755..42e691755 100644
--- a/src/test/ui/wf/wf-object-safe.rs
+++ b/tests/ui/wf/wf-object-safe.rs
diff --git a/src/test/ui/wf/wf-object-safe.stderr b/tests/ui/wf/wf-object-safe.stderr
index 64969fbe3..64969fbe3 100644
--- a/src/test/ui/wf/wf-object-safe.stderr
+++ b/tests/ui/wf/wf-object-safe.stderr
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
index 85a332e24..85a332e24 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
+++ b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.rs
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
index 4d4d8b2ab..4d4d8b2ab 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
+++ b/tests/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
diff --git a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
index d0167c8c2..d0167c8c2 100644
--- a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
+++ b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs
diff --git a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
index e460cdcd3..e460cdcd3 100644
--- a/src/test/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
+++ b/tests/ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.stderr
diff --git a/src/test/ui/wf/wf-static-method.rs b/tests/ui/wf/wf-static-method.rs
index 7ff195230..7ff195230 100644
--- a/src/test/ui/wf/wf-static-method.rs
+++ b/tests/ui/wf/wf-static-method.rs
diff --git a/src/test/ui/wf/wf-static-method.stderr b/tests/ui/wf/wf-static-method.stderr
index 161609a5f..161609a5f 100644
--- a/src/test/ui/wf/wf-static-method.stderr
+++ b/tests/ui/wf/wf-static-method.stderr
diff --git a/src/test/ui/wf/wf-static-type.rs b/tests/ui/wf/wf-static-type.rs
index 1c35e1daf..1c35e1daf 100644
--- a/src/test/ui/wf/wf-static-type.rs
+++ b/tests/ui/wf/wf-static-type.rs
diff --git a/src/test/ui/wf/wf-static-type.stderr b/tests/ui/wf/wf-static-type.stderr
index 16c6124b6..16c6124b6 100644
--- a/src/test/ui/wf/wf-static-type.stderr
+++ b/tests/ui/wf/wf-static-type.stderr
diff --git a/src/test/ui/wf/wf-struct-bound.rs b/tests/ui/wf/wf-struct-bound.rs
index 6e558ca8f..6e558ca8f 100644
--- a/src/test/ui/wf/wf-struct-bound.rs
+++ b/tests/ui/wf/wf-struct-bound.rs
diff --git a/src/test/ui/wf/wf-struct-bound.stderr b/tests/ui/wf/wf-struct-bound.stderr
index 6248e3e4e..6248e3e4e 100644
--- a/src/test/ui/wf/wf-struct-bound.stderr
+++ b/tests/ui/wf/wf-struct-bound.stderr
diff --git a/src/test/ui/wf/wf-struct-field.rs b/tests/ui/wf/wf-struct-field.rs
index 63f8b4382..63f8b4382 100644
--- a/src/test/ui/wf/wf-struct-field.rs
+++ b/tests/ui/wf/wf-struct-field.rs
diff --git a/src/test/ui/wf/wf-struct-field.stderr b/tests/ui/wf/wf-struct-field.stderr
index 78a8da860..78a8da860 100644
--- a/src/test/ui/wf/wf-struct-field.stderr
+++ b/tests/ui/wf/wf-struct-field.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.rs b/tests/ui/wf/wf-trait-associated-type-bound.rs
index 2f20e65e5..2f20e65e5 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.rs
+++ b/tests/ui/wf/wf-trait-associated-type-bound.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.stderr b/tests/ui/wf/wf-trait-associated-type-bound.stderr
index 829770017..829770017 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-bound.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-region.rs b/tests/ui/wf/wf-trait-associated-type-region.rs
index 0dfc9f098..0dfc9f098 100644
--- a/src/test/ui/wf/wf-trait-associated-type-region.rs
+++ b/tests/ui/wf/wf-trait-associated-type-region.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-region.stderr b/tests/ui/wf/wf-trait-associated-type-region.stderr
index 6e2cc8aba..6e2cc8aba 100644
--- a/src/test/ui/wf/wf-trait-associated-type-region.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-region.stderr
diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.rs b/tests/ui/wf/wf-trait-associated-type-trait.rs
index d67e110ed..d67e110ed 100644
--- a/src/test/ui/wf/wf-trait-associated-type-trait.rs
+++ b/tests/ui/wf/wf-trait-associated-type-trait.rs
diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.stderr b/tests/ui/wf/wf-trait-associated-type-trait.stderr
index a73c3a2ae..a73c3a2ae 100644
--- a/src/test/ui/wf/wf-trait-associated-type-trait.stderr
+++ b/tests/ui/wf/wf-trait-associated-type-trait.stderr
diff --git a/src/test/ui/wf/wf-trait-bound.rs b/tests/ui/wf/wf-trait-bound.rs
index 62a1eb5b0..62a1eb5b0 100644
--- a/src/test/ui/wf/wf-trait-bound.rs
+++ b/tests/ui/wf/wf-trait-bound.rs
diff --git a/src/test/ui/wf/wf-trait-bound.stderr b/tests/ui/wf/wf-trait-bound.stderr
index bace3e3ef..bace3e3ef 100644
--- a/src/test/ui/wf/wf-trait-bound.stderr
+++ b/tests/ui/wf/wf-trait-bound.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.rs b/tests/ui/wf/wf-trait-default-fn-arg.rs
index 64fc35aeb..64fc35aeb 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.rs
+++ b/tests/ui/wf/wf-trait-default-fn-arg.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.stderr b/tests/ui/wf/wf-trait-default-fn-arg.stderr
index 8c3d0568f..8c3d0568f 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.rs b/tests/ui/wf/wf-trait-default-fn-ret.rs
index 2103dae8d..2103dae8d 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.rs
+++ b/tests/ui/wf/wf-trait-default-fn-ret.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.stderr b/tests/ui/wf/wf-trait-default-fn-ret.stderr
index 6422e862d..6422e862d 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs b/tests/ui/wf/wf-trait-default-fn-where-clause.rs
index ded97214f..ded97214f 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs
+++ b/tests/ui/wf/wf-trait-default-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr
index f260d5750..f260d5750 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-trait-default-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-arg.rs b/tests/ui/wf/wf-trait-fn-arg.rs
index 044569942..044569942 100644
--- a/src/test/ui/wf/wf-trait-fn-arg.rs
+++ b/tests/ui/wf/wf-trait-fn-arg.rs
diff --git a/src/test/ui/wf/wf-trait-fn-arg.stderr b/tests/ui/wf/wf-trait-fn-arg.stderr
index 3bd1f4892..3bd1f4892 100644
--- a/src/test/ui/wf/wf-trait-fn-arg.stderr
+++ b/tests/ui/wf/wf-trait-fn-arg.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-ret.rs b/tests/ui/wf/wf-trait-fn-ret.rs
index f49e43087..f49e43087 100644
--- a/src/test/ui/wf/wf-trait-fn-ret.rs
+++ b/tests/ui/wf/wf-trait-fn-ret.rs
diff --git a/src/test/ui/wf/wf-trait-fn-ret.stderr b/tests/ui/wf/wf-trait-fn-ret.stderr
index 9bd3cc771..9bd3cc771 100644
--- a/src/test/ui/wf/wf-trait-fn-ret.stderr
+++ b/tests/ui/wf/wf-trait-fn-ret.stderr
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.rs b/tests/ui/wf/wf-trait-fn-where-clause.rs
index 1d2427ff9..1d2427ff9 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.rs
+++ b/tests/ui/wf/wf-trait-fn-where-clause.rs
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.stderr b/tests/ui/wf/wf-trait-fn-where-clause.stderr
index d064f7fc5..d064f7fc5 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.stderr
+++ b/tests/ui/wf/wf-trait-fn-where-clause.stderr
diff --git a/src/test/ui/wf/wf-trait-superbound.rs b/tests/ui/wf/wf-trait-superbound.rs
index 8905a8820..8905a8820 100644
--- a/src/test/ui/wf/wf-trait-superbound.rs
+++ b/tests/ui/wf/wf-trait-superbound.rs
diff --git a/src/test/ui/wf/wf-trait-superbound.stderr b/tests/ui/wf/wf-trait-superbound.stderr
index cd49243a4..cd49243a4 100644
--- a/src/test/ui/wf/wf-trait-superbound.stderr
+++ b/tests/ui/wf/wf-trait-superbound.stderr
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.rs b/tests/ui/wf/wf-unsafe-trait-obj-match.rs
index c8731a8ec..c8731a8ec 100644
--- a/src/test/ui/wf/wf-unsafe-trait-obj-match.rs
+++ b/tests/ui/wf/wf-unsafe-trait-obj-match.rs
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr b/tests/ui/wf/wf-unsafe-trait-obj-match.stderr
index 96fc1d36b..96fc1d36b 100644
--- a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
+++ b/tests/ui/wf/wf-unsafe-trait-obj-match.stderr