86 files changed, 6 insertions, 2 deletions

diff --git a/src/test/ui/associated-consts/assoc-const-eq-missing.rs b/tests/ui/associated-consts/assoc-const-eq-missing.rs
index 5e029a12d..5e029a12d 100644
--- a/src/test/ui/associated-consts/assoc-const-eq-missing.rs
+++ b/tests/ui/associated-consts/assoc-const-eq-missing.rs
diff --git a/src/test/ui/associated-consts/assoc-const-eq-missing.stderr b/tests/ui/associated-consts/assoc-const-eq-missing.stderr
index b4bd6456c..b4bd6456c 100644
--- a/src/test/ui/associated-consts/assoc-const-eq-missing.stderr
+++ b/tests/ui/associated-consts/assoc-const-eq-missing.stderr
diff --git a/src/test/ui/associated-consts/assoc-const-ty-mismatch.rs b/tests/ui/associated-consts/assoc-const-ty-mismatch.rs
index c5d78469e..c5d78469e 100644
--- a/src/test/ui/associated-consts/assoc-const-ty-mismatch.rs
+++ b/tests/ui/associated-consts/assoc-const-ty-mismatch.rs
diff --git a/src/test/ui/associated-consts/assoc-const-ty-mismatch.stderr b/tests/ui/associated-consts/assoc-const-ty-mismatch.stderr
index 11198729e..11198729e 100644
--- a/src/test/ui/associated-consts/assoc-const-ty-mismatch.stderr
+++ b/tests/ui/associated-consts/assoc-const-ty-mismatch.stderr
diff --git a/src/test/ui/associated-consts/assoc-const.rs b/tests/ui/associated-consts/assoc-const.rs
index 9c7884c80..9c7884c80 100644
--- a/src/test/ui/associated-consts/assoc-const.rs
+++ b/tests/ui/associated-consts/assoc-const.rs
diff --git a/src/test/ui/associated-consts/associated-const-ambiguity-report.rs b/tests/ui/associated-consts/associated-const-ambiguity-report.rs
index 927d2c69e..927d2c69e 100644
--- a/src/test/ui/associated-consts/associated-const-ambiguity-report.rs
+++ b/tests/ui/associated-consts/associated-const-ambiguity-report.rs
diff --git a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr b/tests/ui/associated-consts/associated-const-ambiguity-report.stderr
index 5435f2232..5435f2232 100644
--- a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
+++ b/tests/ui/associated-consts/associated-const-ambiguity-report.stderr
diff --git a/src/test/ui/associated-consts/associated-const-array-len.rs b/tests/ui/associated-consts/associated-const-array-len.rs
index 17d782427..17d782427 100644
--- a/src/test/ui/associated-consts/associated-const-array-len.rs
+++ b/tests/ui/associated-consts/associated-const-array-len.rs
diff --git a/src/test/ui/associated-consts/associated-const-array-len.stderr b/tests/ui/associated-consts/associated-const-array-len.stderr
index 86c62e7b7..86c62e7b7 100644
--- a/src/test/ui/associated-consts/associated-const-array-len.stderr
+++ b/tests/ui/associated-consts/associated-const-array-len.stderr
diff --git a/src/test/ui/associated-consts/associated-const-const-eval.rs b/tests/ui/associated-consts/associated-const-const-eval.rs
index 5a34bb97c..5a34bb97c 100644
--- a/src/test/ui/associated-consts/associated-const-const-eval.rs
+++ b/tests/ui/associated-consts/associated-const-const-eval.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs b/tests/ui/associated-consts/associated-const-cross-crate-const-eval.rs
index 611639b84..611639b84 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate-const-eval.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs b/tests/ui/associated-consts/associated-const-cross-crate-defaults.rs
index 92d9cffec..92d9cffec 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate-defaults.rs
diff --git a/src/test/ui/associated-consts/associated-const-cross-crate.rs b/tests/ui/associated-consts/associated-const-cross-crate.rs
index ecdc112e0..ecdc112e0 100644
--- a/src/test/ui/associated-consts/associated-const-cross-crate.rs
+++ b/tests/ui/associated-consts/associated-const-cross-crate.rs
diff --git a/src/test/ui/associated-consts/associated-const-dead-code.rs b/tests/ui/associated-consts/associated-const-dead-code.rs
index f7b676418..f7b676418 100644
--- a/src/test/ui/associated-consts/associated-const-dead-code.rs
+++ b/tests/ui/associated-consts/associated-const-dead-code.rs
diff --git a/src/test/ui/associated-consts/associated-const-dead-code.stderr b/tests/ui/associated-consts/associated-const-dead-code.stderr
index cc701cc4b..cc701cc4b 100644
--- a/src/test/ui/associated-consts/associated-const-dead-code.stderr
+++ b/tests/ui/associated-consts/associated-const-dead-code.stderr
diff --git a/src/test/ui/associated-consts/associated-const-generic-obligations.rs b/tests/ui/associated-consts/associated-const-generic-obligations.rs
index 498e315b5..498e315b5 100644
--- a/src/test/ui/associated-consts/associated-const-generic-obligations.rs
+++ b/tests/ui/associated-consts/associated-const-generic-obligations.rs
diff --git a/src/test/ui/associated-consts/associated-const-generic-obligations.stderr b/tests/ui/associated-consts/associated-const-generic-obligations.stderr
index f45fa0ad5..f45fa0ad5 100644
--- a/src/test/ui/associated-consts/associated-const-generic-obligations.stderr
+++ b/tests/ui/associated-consts/associated-const-generic-obligations.stderr
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
index 63bac9613..63bac9613 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
index 742b81535..742b81535 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs b/tests/ui/associated-consts/associated-const-impl-wrong-type.rs
index 1aad749c1..1aad749c1 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-type.rs
diff --git a/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr b/tests/ui/associated-consts/associated-const-impl-wrong-type.stderr
index f3616035f..f3616035f 100644
--- a/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
+++ b/tests/ui/associated-consts/associated-const-impl-wrong-type.stderr
diff --git a/src/test/ui/associated-consts/associated-const-in-global-const.rs b/tests/ui/associated-consts/associated-const-in-global-const.rs
index 18d7a1215..18d7a1215 100644
--- a/src/test/ui/associated-consts/associated-const-in-global-const.rs
+++ b/tests/ui/associated-consts/associated-const-in-global-const.rs
diff --git a/src/test/ui/associated-consts/associated-const-in-trait.rs b/tests/ui/associated-consts/associated-const-in-trait.rs
index cf5d5d859..cf5d5d859 100644
--- a/src/test/ui/associated-consts/associated-const-in-trait.rs
+++ b/tests/ui/associated-consts/associated-const-in-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const-in-trait.stderr b/tests/ui/associated-consts/associated-const-in-trait.stderr
index 60bbe385c..60bbe385c 100644
--- a/src/test/ui/associated-consts/associated-const-in-trait.stderr
+++ b/tests/ui/associated-consts/associated-const-in-trait.stderr
diff --git a/src/test/ui/associated-consts/associated-const-inherent-impl.rs b/tests/ui/associated-consts/associated-const-inherent-impl.rs
index c6d956dff..c6d956dff 100644
--- a/src/test/ui/associated-consts/associated-const-inherent-impl.rs
+++ b/tests/ui/associated-consts/associated-const-inherent-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-marks-live-code.rs b/tests/ui/associated-consts/associated-const-marks-live-code.rs
index 68eb4e25d..68eb4e25d 100644
--- a/src/test/ui/associated-consts/associated-const-marks-live-code.rs
+++ b/tests/ui/associated-consts/associated-const-marks-live-code.rs
diff --git a/src/test/ui/associated-consts/associated-const-match-patterns.rs b/tests/ui/associated-consts/associated-const-match-patterns.rs
index 62c1cb983..62c1cb983 100644
--- a/src/test/ui/associated-consts/associated-const-match-patterns.rs
+++ b/tests/ui/associated-consts/associated-const-match-patterns.rs
diff --git a/src/test/ui/associated-consts/associated-const-no-item.rs b/tests/ui/associated-consts/associated-const-no-item.rs
index 024d14e21..024d14e21 100644
--- a/src/test/ui/associated-consts/associated-const-no-item.rs
+++ b/tests/ui/associated-consts/associated-const-no-item.rs
diff --git a/src/test/ui/associated-consts/associated-const-no-item.stderr b/tests/ui/associated-consts/associated-const-no-item.stderr
index fe27da5ac..fe27da5ac 100644
--- a/src/test/ui/associated-consts/associated-const-no-item.stderr
+++ b/tests/ui/associated-consts/associated-const-no-item.stderr
diff --git a/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs b/tests/ui/associated-consts/associated-const-outer-ty-refs.rs
index f32ca0ccc..f32ca0ccc 100644
--- a/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs
+++ b/tests/ui/associated-consts/associated-const-outer-ty-refs.rs
diff --git a/src/test/ui/associated-consts/associated-const-overwrite-default.rs b/tests/ui/associated-consts/associated-const-overwrite-default.rs
index 445135aef..445135aef 100644
--- a/src/test/ui/associated-consts/associated-const-overwrite-default.rs
+++ b/tests/ui/associated-consts/associated-const-overwrite-default.rs
diff --git a/src/test/ui/associated-consts/associated-const-private-impl.rs b/tests/ui/associated-consts/associated-const-private-impl.rs
index 3ee3134ac..3ee3134ac 100644
--- a/src/test/ui/associated-consts/associated-const-private-impl.rs
+++ b/tests/ui/associated-consts/associated-const-private-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-private-impl.stderr b/tests/ui/associated-consts/associated-const-private-impl.stderr
index a3fa3002e..a3fa3002e 100644
--- a/src/test/ui/associated-consts/associated-const-private-impl.stderr
+++ b/tests/ui/associated-consts/associated-const-private-impl.stderr
diff --git a/src/test/ui/associated-consts/associated-const-public-impl.rs b/tests/ui/associated-consts/associated-const-public-impl.rs
index 787bee0ff..787bee0ff 100644
--- a/src/test/ui/associated-consts/associated-const-public-impl.rs
+++ b/tests/ui/associated-consts/associated-const-public-impl.rs
diff --git a/src/test/ui/associated-consts/associated-const-range-match-patterns.rs b/tests/ui/associated-consts/associated-const-range-match-patterns.rs
index 5276869a7..5276869a7 100644
--- a/src/test/ui/associated-consts/associated-const-range-match-patterns.rs
+++ b/tests/ui/associated-consts/associated-const-range-match-patterns.rs
diff --git a/src/test/ui/associated-consts/associated-const-resolution-order.rs b/tests/ui/associated-consts/associated-const-resolution-order.rs
index d2ccd30a6..d2ccd30a6 100644
--- a/src/test/ui/associated-consts/associated-const-resolution-order.rs
+++ b/tests/ui/associated-consts/associated-const-resolution-order.rs
diff --git a/src/test/ui/associated-consts/associated-const-self-type.rs b/tests/ui/associated-consts/associated-const-self-type.rs
index 36e1e4ecc..36e1e4ecc 100644
--- a/src/test/ui/associated-consts/associated-const-self-type.rs
+++ b/tests/ui/associated-consts/associated-const-self-type.rs
diff --git a/src/test/ui/associated-consts/associated-const-trait-bound.rs b/tests/ui/associated-consts/associated-const-trait-bound.rs
index 403cdbd7f..403cdbd7f 100644
--- a/src/test/ui/associated-consts/associated-const-trait-bound.rs
+++ b/tests/ui/associated-consts/associated-const-trait-bound.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs b/tests/ui/associated-consts/associated-const-type-parameter-arms.rs
index 3f260d84e..3f260d84e 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arms.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arms.stderr
index 1ccf9febd..1ccf9febd 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arms.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
index 8fe79b97d..8fe79b97d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
index 0bc019b2d..0bc019b2d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs b/tests/ui/associated-consts/associated-const-type-parameter-arrays.rs
index 5152d7840..5152d7840 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays.rs
diff --git a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr b/tests/ui/associated-consts/associated-const-type-parameter-arrays.stderr
index 46a54a12d..46a54a12d 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
+++ b/tests/ui/associated-consts/associated-const-type-parameter-arrays.stderr
diff --git a/src/test/ui/associated-consts/associated-const-type-parameters.rs b/tests/ui/associated-consts/associated-const-type-parameters.rs
index e7ead1045..e7ead1045 100644
--- a/src/test/ui/associated-consts/associated-const-type-parameters.rs
+++ b/tests/ui/associated-consts/associated-const-type-parameters.rs
diff --git a/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs b/tests/ui/associated-consts/associated-const-ufcs-infer-trait.rs
index ca44c9f45..ca44c9f45 100644
--- a/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs
+++ b/tests/ui/associated-consts/associated-const-ufcs-infer-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const-use-default.rs b/tests/ui/associated-consts/associated-const-use-default.rs
index adf36b1ff..adf36b1ff 100644
--- a/src/test/ui/associated-consts/associated-const-use-default.rs
+++ b/tests/ui/associated-consts/associated-const-use-default.rs
diff --git a/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs b/tests/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
index 8f01bae4f..8f01bae4f 100644
--- a/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
+++ b/tests/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
diff --git a/src/test/ui/associated-consts/associated-const.rs b/tests/ui/associated-consts/associated-const.rs
index e4b1c29f3..e4b1c29f3 100644
--- a/src/test/ui/associated-consts/associated-const.rs
+++ b/tests/ui/associated-consts/associated-const.rs
diff --git a/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs b/tests/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
index 4fcefe32c..4fcefe32c 100644
--- a/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
+++ b/tests/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/ui/associated-consts/auxiliary/empty-struct.rs b/tests/ui/associated-consts/auxiliary/empty-struct.rs
index 93275e714..93275e714 100644
--- a/src/test/ui/associated-consts/auxiliary/empty-struct.rs
+++ b/tests/ui/associated-consts/auxiliary/empty-struct.rs
diff --git a/src/test/ui/associated-consts/defaults-cyclic-fail.rs b/tests/ui/associated-consts/defaults-cyclic-fail.rs
index a1c6840a0..a1c6840a0 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-fail.rs
+++ b/tests/ui/associated-consts/defaults-cyclic-fail.rs
diff --git a/src/test/ui/associated-consts/defaults-cyclic-fail.stderr b/tests/ui/associated-consts/defaults-cyclic-fail.stderr
index a1483911b..a1483911b 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-fail.stderr
+++ b/tests/ui/associated-consts/defaults-cyclic-fail.stderr
diff --git a/src/test/ui/associated-consts/defaults-cyclic-pass.rs b/tests/ui/associated-consts/defaults-cyclic-pass.rs
index 82105f25f..82105f25f 100644
--- a/src/test/ui/associated-consts/defaults-cyclic-pass.rs
+++ b/tests/ui/associated-consts/defaults-cyclic-pass.rs
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-fail.rs b/tests/ui/associated-consts/defaults-not-assumed-fail.rs
index 495dfb338..495dfb338 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-fail.rs
+++ b/tests/ui/associated-consts/defaults-not-assumed-fail.rs
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr b/tests/ui/associated-consts/defaults-not-assumed-fail.stderr
index fb7159e40..fb7159e40 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
+++ b/tests/ui/associated-consts/defaults-not-assumed-fail.stderr
diff --git a/src/test/ui/associated-consts/defaults-not-assumed-pass.rs b/tests/ui/associated-consts/defaults-not-assumed-pass.rs
index c08e05c8a..c08e05c8a 100644
--- a/src/test/ui/associated-consts/defaults-not-assumed-pass.rs
+++ b/tests/ui/associated-consts/defaults-not-assumed-pass.rs
diff --git a/src/test/ui/associated-consts/issue-102335-const.rs b/tests/ui/associated-consts/issue-102335-const.rs
index f60cb92da..f60cb92da 100644
--- a/src/test/ui/associated-consts/issue-102335-const.rs
+++ b/tests/ui/associated-consts/issue-102335-const.rs
diff --git a/src/test/ui/associated-consts/issue-102335-const.stderr b/tests/ui/associated-consts/issue-102335-const.stderr
index 531d15c59..531d15c59 100644
--- a/src/test/ui/associated-consts/issue-102335-const.stderr
+++ b/tests/ui/associated-consts/issue-102335-const.stderr
diff --git a/src/test/ui/issues/issue-105330.rs b/tests/ui/associated-consts/issue-105330.rs
index 86e45f10b..86e45f10b 100644
--- a/src/test/ui/issues/issue-105330.rs
+++ b/tests/ui/associated-consts/issue-105330.rs
diff --git a/src/test/ui/issues/issue-105330.stderr b/tests/ui/associated-consts/issue-105330.stderr
index 92f2ccb65..30c380152 100644
--- a/src/test/ui/issues/issue-105330.stderr
+++ b/tests/ui/associated-consts/issue-105330.stderr
@@ -55,8 +55,10 @@ error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
   --> $DIR/issue-105330.rs:12:11
    |
 LL |     foo::<Demo>()();
-   |           ^^^^ types differ
+   |           ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
    |
+   = note: expected constant `32`
+              found constant `<Demo as TraitWAssocConst>::A`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:28
    |
@@ -89,8 +91,10 @@ error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
   --> $DIR/issue-105330.rs:19:11
    |
 LL |     foo::<Demo>();
-   |           ^^^^ types differ
+   |           ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
    |
+   = note: expected constant `32`
+              found constant `<Demo as TraitWAssocConst>::A`
 note: required by a bound in `foo`
   --> $DIR/issue-105330.rs:11:28
    |
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
index 0315938a7..0315938a7 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
index be5781761..be5781761 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
index 4e89f6862..4e89f6862 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
index 8347b260b..8347b260b 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
index 68b653ff3..68b653ff3 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.rs
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
index 3955a3120..3955a3120 100644
--- a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
+++ b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
diff --git a/src/test/ui/associated-consts/issue-47814.rs b/tests/ui/associated-consts/issue-47814.rs
index a28b1c001..a28b1c001 100644
--- a/src/test/ui/associated-consts/issue-47814.rs
+++ b/tests/ui/associated-consts/issue-47814.rs
diff --git a/src/test/ui/associated-consts/issue-47814.stderr b/tests/ui/associated-consts/issue-47814.stderr
index 2e4ddb811..2e4ddb811 100644
--- a/src/test/ui/associated-consts/issue-47814.stderr
+++ b/tests/ui/associated-consts/issue-47814.stderr
diff --git a/src/test/ui/associated-consts/issue-58022.rs b/tests/ui/associated-consts/issue-58022.rs
index 2a8a1eaa6..2a8a1eaa6 100644
--- a/src/test/ui/associated-consts/issue-58022.rs
+++ b/tests/ui/associated-consts/issue-58022.rs
diff --git a/src/test/ui/associated-consts/issue-58022.stderr b/tests/ui/associated-consts/issue-58022.stderr
index 56d85c066..56d85c066 100644
--- a/src/test/ui/associated-consts/issue-58022.stderr
+++ b/tests/ui/associated-consts/issue-58022.stderr
diff --git a/src/test/ui/associated-consts/issue-63496.rs b/tests/ui/associated-consts/issue-63496.rs
index 67ef4e74c..67ef4e74c 100644
--- a/src/test/ui/associated-consts/issue-63496.rs
+++ b/tests/ui/associated-consts/issue-63496.rs
diff --git a/src/test/ui/associated-consts/issue-63496.stderr b/tests/ui/associated-consts/issue-63496.stderr
index f2a4e01ad..f2a4e01ad 100644
--- a/src/test/ui/associated-consts/issue-63496.stderr
+++ b/tests/ui/associated-consts/issue-63496.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
index 0c3581900..0c3581900 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
index d4af6e864..d4af6e864 100644
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
+++ b/tests/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
diff --git a/src/test/ui/associated-consts/issue-88599-ref-self.rs b/tests/ui/associated-consts/issue-88599-ref-self.rs
index f1144db44..f1144db44 100644
--- a/src/test/ui/associated-consts/issue-88599-ref-self.rs
+++ b/tests/ui/associated-consts/issue-88599-ref-self.rs
diff --git a/src/test/ui/associated-consts/issue-93775.rs b/tests/ui/associated-consts/issue-93775.rs
index 7a007b732..7a007b732 100644
--- a/src/test/ui/associated-consts/issue-93775.rs
+++ b/tests/ui/associated-consts/issue-93775.rs
diff --git a/src/test/ui/associated-consts/issue-93835.rs b/tests/ui/associated-consts/issue-93835.rs
index b2a437fcb..b2a437fcb 100644
--- a/src/test/ui/associated-consts/issue-93835.rs
+++ b/tests/ui/associated-consts/issue-93835.rs
diff --git a/src/test/ui/associated-consts/issue-93835.stderr b/tests/ui/associated-consts/issue-93835.stderr
index be0573a13..be0573a13 100644
--- a/src/test/ui/associated-consts/issue-93835.stderr
+++ b/tests/ui/associated-consts/issue-93835.stderr
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_1.rs b/tests/ui/associated-consts/mismatched_impl_ty_1.rs
index 4dc6c2e47..4dc6c2e47 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_1.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_1.rs
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_2.rs b/tests/ui/associated-consts/mismatched_impl_ty_2.rs
index 539becfdc..539becfdc 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_2.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_2.rs
diff --git a/src/test/ui/associated-consts/mismatched_impl_ty_3.rs b/tests/ui/associated-consts/mismatched_impl_ty_3.rs
index 17bcc8fe5..17bcc8fe5 100644
--- a/src/test/ui/associated-consts/mismatched_impl_ty_3.rs
+++ b/tests/ui/associated-consts/mismatched_impl_ty_3.rs
diff --git a/src/test/ui/associated-consts/shadowed-const.rs b/tests/ui/associated-consts/shadowed-const.rs
index cfdb391d3..cfdb391d3 100644
--- a/src/test/ui/associated-consts/shadowed-const.rs
+++ b/tests/ui/associated-consts/shadowed-const.rs
diff --git a/src/test/ui/associated-consts/shadowed-const.stderr b/tests/ui/associated-consts/shadowed-const.stderr
index fe21d2aec..fe21d2aec 100644
--- a/src/test/ui/associated-consts/shadowed-const.stderr
+++ b/tests/ui/associated-consts/shadowed-const.stderr