47 files changed, 9 insertions, 11 deletions
diff --git a/src/test/ui/missing-trait-bounds/auxiliary/issue-69725.rs b/tests/ui/missing-trait-bounds/auxiliary/issue-69725.rs
index 13606e498..13606e498 100644
--- a/src/test/ui/missing-trait-bounds/auxiliary/issue-69725.rs
+++ b/tests/ui/missing-trait-bounds/auxiliary/issue-69725.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.fixed b/tests/ui/missing-trait-bounds/issue-35677.fixed
index 08174d8d8..08174d8d8 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.fixed
+++ b/tests/ui/missing-trait-bounds/issue-35677.fixed
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.rs b/tests/ui/missing-trait-bounds/issue-35677.rs
index 2cb394386..2cb394386 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.rs
+++ b/tests/ui/missing-trait-bounds/issue-35677.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-35677.stderr b/tests/ui/missing-trait-bounds/issue-35677.stderr
index a2201b946..05d3de80d 100644
--- a/src/test/ui/missing-trait-bounds/issue-35677.stderr
+++ b/tests/ui/missing-trait-bounds/issue-35677.stderr
@@ -6,6 +6,8 @@ LL |     this.is_subset(other)
    |
    = note: the following trait bounds were not satisfied:
            `T: Eq`
+           `T: PartialEq`
+           which is required by `T: Eq`
            `T: Hash`
 help: consider restricting the type parameters to satisfy the trait bounds
    |
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.fixed b/tests/ui/missing-trait-bounds/issue-69725.fixed
index d57badcfd..d57badcfd 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.fixed
+++ b/tests/ui/missing-trait-bounds/issue-69725.fixed
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.rs b/tests/ui/missing-trait-bounds/issue-69725.rs
index 9c88969c5..9c88969c5 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.rs
+++ b/tests/ui/missing-trait-bounds/issue-69725.rs
diff --git a/src/test/ui/missing-trait-bounds/issue-69725.stderr b/tests/ui/missing-trait-bounds/issue-69725.stderr
index 980d9dd16..980d9dd16 100644
--- a/src/test/ui/missing-trait-bounds/issue-69725.stderr
+++ b/tests/ui/missing-trait-bounds/issue-69725.stderr
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
index 6b24375e4..6b24375e4 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.fixed
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.rs b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
index df47be070..df47be070 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.rs
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
index cde075501..cde075501 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
+++ b/tests/ui/missing-trait-bounds/missing-trait-bound-for-op.stderr
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
index afd47f71c..afd47f71c 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
+++ b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.rs
diff --git a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
index 9e94aa2c7..968e285af 100644
--- a/src/test/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
+++ b/tests/ui/missing-trait-bounds/missing-trait-bounds-for-method-call.stderr
@@ -7,20 +7,16 @@ LL | struct Foo<T> {
 LL |         self.foo();
    |              ^^^ method cannot be called on `&Foo<T>` due to unsatisfied trait bounds
    |
-note: trait bound `T: Default` was not satisfied
+note: the following trait bounds were not satisfied:
+      `T: Bar`
+      `T: Default`
   --> $DIR/missing-trait-bounds-for-method-call.rs:10:9
    |
 LL | impl<T: Default + Bar> Bar for Foo<T> {}
-   |         ^^^^^^^        ---     ------
-   |         |
+   |         ^^^^^^^   ^^^  ---     ------
+   |         |         |
+   |         |         unsatisfied trait bound introduced here
    |         unsatisfied trait bound introduced here
-note: trait bound `T: Bar` was not satisfied
-  --> $DIR/missing-trait-bounds-for-method-call.rs:10:19
-   |
-LL | impl<T: Default + Bar> Bar for Foo<T> {}
-   |                   ^^^  ---     ------
-   |                   |
-   |                   unsatisfied trait bound introduced here
 help: consider restricting the type parameters to satisfy the trait bounds
    |
 LL | struct Foo<T> where T: Bar, T: Default {
diff --git a/src/test/ui/missing/auxiliary/two_macros.rs b/tests/ui/missing/auxiliary/two_macros.rs
index 2330c75c8..2330c75c8 100644
--- a/src/test/ui/missing/auxiliary/two_macros.rs
+++ b/tests/ui/missing/auxiliary/two_macros.rs
diff --git a/src/test/ui/missing/missing-allocator.rs b/tests/ui/missing/missing-allocator.rs
index 2dc509f2c..2dc509f2c 100644
--- a/src/test/ui/missing/missing-allocator.rs
+++ b/tests/ui/missing/missing-allocator.rs
diff --git a/src/test/ui/missing/missing-allocator.stderr b/tests/ui/missing/missing-allocator.stderr
index 0da5651c1..0da5651c1 100644
--- a/src/test/ui/missing/missing-allocator.stderr
+++ b/tests/ui/missing/missing-allocator.stderr
diff --git a/src/test/ui/missing/missing-block-hint.rs b/tests/ui/missing/missing-block-hint.rs
index 89db02a9c..89db02a9c 100644
--- a/src/test/ui/missing/missing-block-hint.rs
+++ b/tests/ui/missing/missing-block-hint.rs
diff --git a/src/test/ui/missing/missing-block-hint.stderr b/tests/ui/missing/missing-block-hint.stderr
index 16954223a..16954223a 100644
--- a/src/test/ui/missing/missing-block-hint.stderr
+++ b/tests/ui/missing/missing-block-hint.stderr
diff --git a/src/test/ui/missing/missing-comma-in-match.fixed b/tests/ui/missing/missing-comma-in-match.fixed
index f091082f3..f091082f3 100644
--- a/src/test/ui/missing/missing-comma-in-match.fixed
+++ b/tests/ui/missing/missing-comma-in-match.fixed
diff --git a/src/test/ui/missing/missing-comma-in-match.rs b/tests/ui/missing/missing-comma-in-match.rs
index 54dab4e97..54dab4e97 100644
--- a/src/test/ui/missing/missing-comma-in-match.rs
+++ b/tests/ui/missing/missing-comma-in-match.rs
diff --git a/src/test/ui/missing/missing-comma-in-match.stderr b/tests/ui/missing/missing-comma-in-match.stderr
index fe210f697..fe210f697 100644
--- a/src/test/ui/missing/missing-comma-in-match.stderr
+++ b/tests/ui/missing/missing-comma-in-match.stderr
diff --git a/src/test/ui/missing/missing-derivable-attr.rs b/tests/ui/missing/missing-derivable-attr.rs
index 58c94de50..58c94de50 100644
--- a/src/test/ui/missing/missing-derivable-attr.rs
+++ b/tests/ui/missing/missing-derivable-attr.rs
diff --git a/src/test/ui/missing/missing-derivable-attr.stderr b/tests/ui/missing/missing-derivable-attr.stderr
index 9b8c0c583..9b8c0c583 100644
--- a/src/test/ui/missing/missing-derivable-attr.stderr
+++ b/tests/ui/missing/missing-derivable-attr.stderr
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.rs b/tests/ui/missing/missing-fields-in-struct-pattern.rs
index 40304a674..40304a674 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.rs
+++ b/tests/ui/missing/missing-fields-in-struct-pattern.rs
diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr b/tests/ui/missing/missing-fields-in-struct-pattern.stderr
index 1fe9f5299..1fe9f5299 100644
--- a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr
+++ b/tests/ui/missing/missing-fields-in-struct-pattern.stderr
diff --git a/src/test/ui/missing/missing-items/auxiliary/m1.rs b/tests/ui/missing/missing-items/auxiliary/m1.rs
index fcf52c9e8..fcf52c9e8 100644
--- a/src/test/ui/missing/missing-items/auxiliary/m1.rs
+++ b/tests/ui/missing/missing-items/auxiliary/m1.rs
diff --git a/src/test/ui/missing/missing-items/m2.rs b/tests/ui/missing/missing-items/m2.rs
index c2a6914ab..c2a6914ab 100644
--- a/src/test/ui/missing/missing-items/m2.rs
+++ b/tests/ui/missing/missing-items/m2.rs
diff --git a/src/test/ui/missing/missing-items/m2.stderr b/tests/ui/missing/missing-items/m2.stderr
index d18fb443a..d18fb443a 100644
--- a/src/test/ui/missing/missing-items/m2.stderr
+++ b/tests/ui/missing/missing-items/m2.stderr
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.rs b/tests/ui/missing/missing-items/missing-type-parameter.rs
index 8a64053a4..8a64053a4 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.rs
+++ b/tests/ui/missing/missing-items/missing-type-parameter.rs
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.stderr b/tests/ui/missing/missing-items/missing-type-parameter.stderr
index 722539fca..722539fca 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter.stderr
+++ b/tests/ui/missing/missing-items/missing-type-parameter.stderr
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.rs b/tests/ui/missing/missing-items/missing-type-parameter2.rs
index e9b32fb71..e9b32fb71 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter2.rs
+++ b/tests/ui/missing/missing-items/missing-type-parameter2.rs
diff --git a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr b/tests/ui/missing/missing-items/missing-type-parameter2.stderr
index f33951c98..f33951c98 100644
--- a/src/test/ui/missing/missing-items/missing-type-parameter2.stderr
+++ b/tests/ui/missing/missing-items/missing-type-parameter2.stderr
diff --git a/src/test/ui/missing/missing-macro-use.rs b/tests/ui/missing/missing-macro-use.rs
index d494c4471..d494c4471 100644
--- a/src/test/ui/missing/missing-macro-use.rs
+++ b/tests/ui/missing/missing-macro-use.rs
diff --git a/src/test/ui/missing/missing-macro-use.stderr b/tests/ui/missing/missing-macro-use.stderr
index ced062269..99e291cda 100644
--- a/src/test/ui/missing/missing-macro-use.stderr
+++ b/tests/ui/missing/missing-macro-use.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `macro_two` in this scope
 LL |     macro_two!();
    |     ^^^^^^^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            two_macros::macro_two
 
 error: aborting due to previous error
diff --git a/src/test/ui/missing/missing-main.rs b/tests/ui/missing/missing-main.rs
index 6ad544533..6ad544533 100644
--- a/src/test/ui/missing/missing-main.rs
+++ b/tests/ui/missing/missing-main.rs
diff --git a/src/test/ui/missing/missing-main.stderr b/tests/ui/missing/missing-main.stderr
index 5113dc6ec..5113dc6ec 100644
--- a/src/test/ui/missing/missing-main.stderr
+++ b/tests/ui/missing/missing-main.stderr
diff --git a/src/test/ui/missing/missing-return.rs b/tests/ui/missing/missing-return.rs
index 6a171753d..6a171753d 100644
--- a/src/test/ui/missing/missing-return.rs
+++ b/tests/ui/missing/missing-return.rs
diff --git a/src/test/ui/missing/missing-return.stderr b/tests/ui/missing/missing-return.stderr
index ff7f261e0..ff7f261e0 100644
--- a/src/test/ui/missing/missing-return.stderr
+++ b/tests/ui/missing/missing-return.stderr
diff --git a/src/test/ui/missing/missing-stability.rs b/tests/ui/missing/missing-stability.rs
index 0da5808b4..0da5808b4 100644
--- a/src/test/ui/missing/missing-stability.rs
+++ b/tests/ui/missing/missing-stability.rs
diff --git a/src/test/ui/missing/missing-stability.stderr b/tests/ui/missing/missing-stability.stderr
index 659f8c78c..659f8c78c 100644
--- a/src/test/ui/missing/missing-stability.stderr
+++ b/tests/ui/missing/missing-stability.stderr
diff --git a/src/test/ui/missing_debug_impls.rs b/tests/ui/missing_debug_impls.rs
index dc4dacfc4..dc4dacfc4 100644
--- a/src/test/ui/missing_debug_impls.rs
+++ b/tests/ui/missing_debug_impls.rs
diff --git a/src/test/ui/missing_debug_impls.stderr b/tests/ui/missing_debug_impls.stderr
index 0538f207b..0538f207b 100644
--- a/src/test/ui/missing_debug_impls.stderr
+++ b/tests/ui/missing_debug_impls.stderr
diff --git a/src/test/ui/missing_non_modrs_mod/foo.rs b/tests/ui/missing_non_modrs_mod/foo.rs
index 4f41316c8..4f41316c8 100644
--- a/src/test/ui/missing_non_modrs_mod/foo.rs
+++ b/tests/ui/missing_non_modrs_mod/foo.rs
diff --git a/src/test/ui/missing_non_modrs_mod/foo_inline.rs b/tests/ui/missing_non_modrs_mod/foo_inline.rs
index df60629ec..df60629ec 100644
--- a/src/test/ui/missing_non_modrs_mod/foo_inline.rs
+++ b/tests/ui/missing_non_modrs_mod/foo_inline.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
index 4ff975af6..4ff975af6 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
index 31e4206a5..31e4206a5 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
index 9ebb4f1bd..9ebb4f1bd 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs
diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
index 9d252398b..9d252398b 100644
--- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr
+++ b/tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.stderr