104 files changed, 161 insertions, 20 deletions
diff --git a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
index 70345351b..70345351b 100644
--- a/src/test/ui/derives/auxiliary/derive-marker-tricky.rs
+++ b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.rs b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
index 6ab1fb7b0..6ab1fb7b0 100644
--- a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
+++ b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
index 7f4f78ceb..7f4f78ceb 100644
--- a/src/test/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
+++ b/tests/ui/derives/clone-debug-dead-code-in-the-same-struct.stderr
diff --git a/src/test/ui/derives/clone-debug-dead-code.rs b/tests/ui/derives/clone-debug-dead-code.rs
index ab49260c0..ab49260c0 100644
--- a/src/test/ui/derives/clone-debug-dead-code.rs
+++ b/tests/ui/derives/clone-debug-dead-code.rs
diff --git a/src/test/ui/derives/clone-debug-dead-code.stderr b/tests/ui/derives/clone-debug-dead-code.stderr
index 38be486e3..38be486e3 100644
--- a/src/test/ui/derives/clone-debug-dead-code.stderr
+++ b/tests/ui/derives/clone-debug-dead-code.stderr
diff --git a/src/test/ui/derives/derive-Debug-use-ufcs-struct.rs b/tests/ui/derives/derive-Debug-use-ufcs-struct.rs
index cb9dda841..cb9dda841 100644
--- a/src/test/ui/derives/derive-Debug-use-ufcs-struct.rs
+++ b/tests/ui/derives/derive-Debug-use-ufcs-struct.rs
diff --git a/src/test/ui/derives/derive-Debug-use-ufcs-tuple.rs b/tests/ui/derives/derive-Debug-use-ufcs-tuple.rs
index 5f786769f..5f786769f 100644
--- a/src/test/ui/derives/derive-Debug-use-ufcs-tuple.rs
+++ b/tests/ui/derives/derive-Debug-use-ufcs-tuple.rs
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.rs b/tests/ui/derives/derive-assoc-type-not-impl.rs
index 0f642d63a..0f642d63a 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.rs
+++ b/tests/ui/derives/derive-assoc-type-not-impl.rs
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/tests/ui/derives/derive-assoc-type-not-impl.stderr
index c4fddcf5f..91b334b41 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr
+++ b/tests/ui/derives/derive-assoc-type-not-impl.stderr
@@ -18,9 +18,6 @@ note: trait bound `NotClone: Clone` was not satisfied
    |
 LL | #[derive(Clone)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `NotClone: Clone`
-           which is required by `Bar<NotClone>: Clone`
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `clone`, perhaps you need to implement it:
            candidate #1: `Clone`
diff --git a/src/test/ui/derives/derive-deadlock.rs b/tests/ui/derives/derive-deadlock.rs
index 0137b1e5b..0137b1e5b 100644
--- a/src/test/ui/derives/derive-deadlock.rs
+++ b/tests/ui/derives/derive-deadlock.rs
diff --git a/src/test/ui/derives/derive-deadlock.stderr b/tests/ui/derives/derive-deadlock.stderr
index 8d062491c..8d062491c 100644
--- a/src/test/ui/derives/derive-deadlock.stderr
+++ b/tests/ui/derives/derive-deadlock.stderr
diff --git a/src/test/ui/derives/derive-hygiene.rs b/tests/ui/derives/derive-hygiene.rs
index 4fa83c490..4fa83c490 100644
--- a/src/test/ui/derives/derive-hygiene.rs
+++ b/tests/ui/derives/derive-hygiene.rs
diff --git a/src/test/ui/derives/derive-macro-const-default.rs b/tests/ui/derives/derive-macro-const-default.rs
index ce80271d2..ce80271d2 100644
--- a/src/test/ui/derives/derive-macro-const-default.rs
+++ b/tests/ui/derives/derive-macro-const-default.rs
diff --git a/src/test/ui/derives/derive-marker-tricky.rs b/tests/ui/derives/derive-marker-tricky.rs
index 730ea4714..730ea4714 100644
--- a/src/test/ui/derives/derive-marker-tricky.rs
+++ b/tests/ui/derives/derive-marker-tricky.rs
diff --git a/src/test/ui/derives/derive-multiple-with-packed.rs b/tests/ui/derives/derive-multiple-with-packed.rs
index e762ee357..e762ee357 100644
--- a/src/test/ui/derives/derive-multiple-with-packed.rs
+++ b/tests/ui/derives/derive-multiple-with-packed.rs
diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs b/tests/ui/derives/derive-on-trait-item-or-impl-item.rs
index 7e579ec22..7e579ec22 100644
--- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs
+++ b/tests/ui/derives/derive-on-trait-item-or-impl-item.rs
diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr b/tests/ui/derives/derive-on-trait-item-or-impl-item.stderr
index 1fd97bdd5..1fd97bdd5 100644
--- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr
+++ b/tests/ui/derives/derive-on-trait-item-or-impl-item.stderr
diff --git a/src/test/ui/derives/derive-partial-ord.rs b/tests/ui/derives/derive-partial-ord.rs
index 9078a7ffa..9078a7ffa 100644
--- a/src/test/ui/derives/derive-partial-ord.rs
+++ b/tests/ui/derives/derive-partial-ord.rs
diff --git a/src/test/ui/derives/derive-renamed.rs b/tests/ui/derives/derive-renamed.rs
index d310e5806..d310e5806 100644
--- a/src/test/ui/derives/derive-renamed.rs
+++ b/tests/ui/derives/derive-renamed.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs b/tests/ui/derives/derives-span-Clone-enum-struct-variant.rs
index b556d4424..b556d4424 100644
--- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Clone-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Clone-enum-struct-variant.stderr
index 7326324b0..7326324b0 100644
--- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Clone-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-enum.rs b/tests/ui/derives/derives-span-Clone-enum.rs
index 9bb4f486c..9bb4f486c 100644
--- a/src/test/ui/derives/derives-span-Clone-enum.rs
+++ b/tests/ui/derives/derives-span-Clone-enum.rs
diff --git a/src/test/ui/derives/derives-span-Clone-enum.stderr b/tests/ui/derives/derives-span-Clone-enum.stderr
index 229a4f7d9..229a4f7d9 100644
--- a/src/test/ui/derives/derives-span-Clone-enum.stderr
+++ b/tests/ui/derives/derives-span-Clone-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-struct.rs b/tests/ui/derives/derives-span-Clone-struct.rs
index f151636f8..f151636f8 100644
--- a/src/test/ui/derives/derives-span-Clone-struct.rs
+++ b/tests/ui/derives/derives-span-Clone-struct.rs
diff --git a/src/test/ui/derives/derives-span-Clone-struct.stderr b/tests/ui/derives/derives-span-Clone-struct.stderr
index 96bad9eda..96bad9eda 100644
--- a/src/test/ui/derives/derives-span-Clone-struct.stderr
+++ b/tests/ui/derives/derives-span-Clone-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs b/tests/ui/derives/derives-span-Clone-tuple-struct.rs
index 7a6288532..7a6288532 100644
--- a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Clone-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr b/tests/ui/derives/derives-span-Clone-tuple-struct.stderr
index b61341e57..b61341e57 100644
--- a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Clone-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs b/tests/ui/derives/derives-span-Debug-enum-struct-variant.rs
index 949597bc8..949597bc8 100644
--- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Debug-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Debug-enum-struct-variant.stderr
index 58a64a4f5..58a64a4f5 100644
--- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Debug-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-enum.rs b/tests/ui/derives/derives-span-Debug-enum.rs
index b2a39708c..b2a39708c 100644
--- a/src/test/ui/derives/derives-span-Debug-enum.rs
+++ b/tests/ui/derives/derives-span-Debug-enum.rs
diff --git a/src/test/ui/derives/derives-span-Debug-enum.stderr b/tests/ui/derives/derives-span-Debug-enum.stderr
index e9bb5f960..e9bb5f960 100644
--- a/src/test/ui/derives/derives-span-Debug-enum.stderr
+++ b/tests/ui/derives/derives-span-Debug-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-struct.rs b/tests/ui/derives/derives-span-Debug-struct.rs
index cf91c9436..cf91c9436 100644
--- a/src/test/ui/derives/derives-span-Debug-struct.rs
+++ b/tests/ui/derives/derives-span-Debug-struct.rs
diff --git a/src/test/ui/derives/derives-span-Debug-struct.stderr b/tests/ui/derives/derives-span-Debug-struct.stderr
index 0a117c060..0a117c060 100644
--- a/src/test/ui/derives/derives-span-Debug-struct.stderr
+++ b/tests/ui/derives/derives-span-Debug-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs b/tests/ui/derives/derives-span-Debug-tuple-struct.rs
index cea973c91..cea973c91 100644
--- a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Debug-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr b/tests/ui/derives/derives-span-Debug-tuple-struct.stderr
index f2e90a418..f2e90a418 100644
--- a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Debug-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Default-struct.rs b/tests/ui/derives/derives-span-Default-struct.rs
index 71fd5829e..71fd5829e 100644
--- a/src/test/ui/derives/derives-span-Default-struct.rs
+++ b/tests/ui/derives/derives-span-Default-struct.rs
diff --git a/src/test/ui/derives/derives-span-Default-struct.stderr b/tests/ui/derives/derives-span-Default-struct.stderr
index d4affd535..d4affd535 100644
--- a/src/test/ui/derives/derives-span-Default-struct.stderr
+++ b/tests/ui/derives/derives-span-Default-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.rs b/tests/ui/derives/derives-span-Default-tuple-struct.rs
index 463f7d230..463f7d230 100644
--- a/src/test/ui/derives/derives-span-Default-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Default-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr b/tests/ui/derives/derives-span-Default-tuple-struct.stderr
index 129351f59..129351f59 100644
--- a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Default-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs b/tests/ui/derives/derives-span-Eq-enum-struct-variant.rs
index d2dab8687..d2dab8687 100644
--- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Eq-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Eq-enum-struct-variant.stderr
index e3fb234b9..2be69a30b 100644
--- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Eq-enum-struct-variant.stderr
@@ -9,9 +9,6 @@ LL |      x: Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-enum.rs b/tests/ui/derives/derives-span-Eq-enum.rs
index c6c0d4321..c6c0d4321 100644
--- a/src/test/ui/derives/derives-span-Eq-enum.rs
+++ b/tests/ui/derives/derives-span-Eq-enum.rs
diff --git a/src/test/ui/derives/derives-span-Eq-enum.stderr b/tests/ui/derives/derives-span-Eq-enum.stderr
index 4e10c3f69..4f4f821cc 100644
--- a/src/test/ui/derives/derives-span-Eq-enum.stderr
+++ b/tests/ui/derives/derives-span-Eq-enum.stderr
@@ -9,9 +9,6 @@ LL |      Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-struct.rs b/tests/ui/derives/derives-span-Eq-struct.rs
index df3100398..df3100398 100644
--- a/src/test/ui/derives/derives-span-Eq-struct.rs
+++ b/tests/ui/derives/derives-span-Eq-struct.rs
diff --git a/src/test/ui/derives/derives-span-Eq-struct.stderr b/tests/ui/derives/derives-span-Eq-struct.stderr
index bfdab052a..f15659c3e 100644
--- a/src/test/ui/derives/derives-span-Eq-struct.stderr
+++ b/tests/ui/derives/derives-span-Eq-struct.stderr
@@ -9,9 +9,6 @@ LL |     x: Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs b/tests/ui/derives/derives-span-Eq-tuple-struct.rs
index abf6526b9..abf6526b9 100644
--- a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Eq-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr b/tests/ui/derives/derives-span-Eq-tuple-struct.stderr
index 26b8be343..4e5659b35 100644
--- a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Eq-tuple-struct.stderr
@@ -9,9 +9,6 @@ LL |     Error
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `Error` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs b/tests/ui/derives/derives-span-Hash-enum-struct-variant.rs
index 3018a7b6d..3018a7b6d 100644
--- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Hash-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Hash-enum-struct-variant.stderr
index fe5e0e96a..fe5e0e96a 100644
--- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Hash-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-enum.rs b/tests/ui/derives/derives-span-Hash-enum.rs
index 8ce7df18f..8ce7df18f 100644
--- a/src/test/ui/derives/derives-span-Hash-enum.rs
+++ b/tests/ui/derives/derives-span-Hash-enum.rs
diff --git a/src/test/ui/derives/derives-span-Hash-enum.stderr b/tests/ui/derives/derives-span-Hash-enum.stderr
index 99785b87c..99785b87c 100644
--- a/src/test/ui/derives/derives-span-Hash-enum.stderr
+++ b/tests/ui/derives/derives-span-Hash-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-struct.rs b/tests/ui/derives/derives-span-Hash-struct.rs
index fa5e2af6b..fa5e2af6b 100644
--- a/src/test/ui/derives/derives-span-Hash-struct.rs
+++ b/tests/ui/derives/derives-span-Hash-struct.rs
diff --git a/src/test/ui/derives/derives-span-Hash-struct.stderr b/tests/ui/derives/derives-span-Hash-struct.stderr
index 4db83dd13..4db83dd13 100644
--- a/src/test/ui/derives/derives-span-Hash-struct.stderr
+++ b/tests/ui/derives/derives-span-Hash-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs b/tests/ui/derives/derives-span-Hash-tuple-struct.rs
index 3822bce14..3822bce14 100644
--- a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Hash-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr b/tests/ui/derives/derives-span-Hash-tuple-struct.stderr
index 8660c97e6..8660c97e6 100644
--- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Hash-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs b/tests/ui/derives/derives-span-Ord-enum-struct-variant.rs
index 62355cc2d..62355cc2d 100644
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-Ord-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr b/tests/ui/derives/derives-span-Ord-enum-struct-variant.stderr
index 6e48332c2..6e48332c2 100644
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-Ord-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-enum.rs b/tests/ui/derives/derives-span-Ord-enum.rs
index 72738931d..72738931d 100644
--- a/src/test/ui/derives/derives-span-Ord-enum.rs
+++ b/tests/ui/derives/derives-span-Ord-enum.rs
diff --git a/src/test/ui/derives/derives-span-Ord-enum.stderr b/tests/ui/derives/derives-span-Ord-enum.stderr
index b05cf0a05..b05cf0a05 100644
--- a/src/test/ui/derives/derives-span-Ord-enum.stderr
+++ b/tests/ui/derives/derives-span-Ord-enum.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-struct.rs b/tests/ui/derives/derives-span-Ord-struct.rs
index 53d4c2c22..53d4c2c22 100644
--- a/src/test/ui/derives/derives-span-Ord-struct.rs
+++ b/tests/ui/derives/derives-span-Ord-struct.rs
diff --git a/src/test/ui/derives/derives-span-Ord-struct.stderr b/tests/ui/derives/derives-span-Ord-struct.stderr
index c4def34a8..c4def34a8 100644
--- a/src/test/ui/derives/derives-span-Ord-struct.stderr
+++ b/tests/ui/derives/derives-span-Ord-struct.stderr
diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs b/tests/ui/derives/derives-span-Ord-tuple-struct.rs
index 4e09c2709..4e09c2709 100644
--- a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-Ord-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr b/tests/ui/derives/derives-span-Ord-tuple-struct.stderr
index a3b288d0f..a3b288d0f 100644
--- a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-Ord-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
index 67a27729d..67a27729d 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
index 9953154fd..9953154fd 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.rs b/tests/ui/derives/derives-span-PartialEq-enum.rs
index 0becc7e0d..0becc7e0d 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum.rs
+++ b/tests/ui/derives/derives-span-PartialEq-enum.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.stderr b/tests/ui/derives/derives-span-PartialEq-enum.stderr
index 7c1304523..7c1304523 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-enum.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.rs b/tests/ui/derives/derives-span-PartialEq-struct.rs
index c92ef5fad..c92ef5fad 100644
--- a/src/test/ui/derives/derives-span-PartialEq-struct.rs
+++ b/tests/ui/derives/derives-span-PartialEq-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.stderr b/tests/ui/derives/derives-span-PartialEq-struct.stderr
index ba3d6ced3..ba3d6ced3 100644
--- a/src/test/ui/derives/derives-span-PartialEq-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs b/tests/ui/derives/derives-span-PartialEq-tuple-struct.rs
index 10ac347aa..10ac347aa 100644
--- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-PartialEq-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr b/tests/ui/derives/derives-span-PartialEq-tuple-struct.stderr
index ab0b56a9e..ab0b56a9e 100644
--- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialEq-tuple-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
index a769c1376..a769c1376 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
index 2d19aaf68..2d19aaf68 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.rs b/tests/ui/derives/derives-span-PartialOrd-enum.rs
index 4f0d794e4..4f0d794e4 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-enum.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr b/tests/ui/derives/derives-span-PartialOrd-enum.stderr
index dfbb8060f..dfbb8060f 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-enum.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.rs b/tests/ui/derives/derives-span-PartialOrd-struct.rs
index da857c674..da857c674 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-struct.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr b/tests/ui/derives/derives-span-PartialOrd-struct.stderr
index ba63d86e8..ba63d86e8 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-struct.stderr
diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.rs
index 61d507670..61d507670 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs
+++ b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.rs
diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
index 7686ed806..7686ed806 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
+++ b/tests/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
diff --git a/src/test/ui/derives/deriving-bounds.rs b/tests/ui/derives/deriving-bounds.rs
index 95d440420..95d440420 100644
--- a/src/test/ui/derives/deriving-bounds.rs
+++ b/tests/ui/derives/deriving-bounds.rs
diff --git a/src/test/ui/derives/deriving-bounds.stderr b/tests/ui/derives/deriving-bounds.stderr
index 74ca37287..74ca37287 100644
--- a/src/test/ui/derives/deriving-bounds.stderr
+++ b/tests/ui/derives/deriving-bounds.stderr
diff --git a/src/test/ui/derives/deriving-copyclone.rs b/tests/ui/derives/deriving-copyclone.rs
index 06b3157a7..06b3157a7 100644
--- a/src/test/ui/derives/deriving-copyclone.rs
+++ b/tests/ui/derives/deriving-copyclone.rs
diff --git a/src/test/ui/derives/deriving-copyclone.stderr b/tests/ui/derives/deriving-copyclone.stderr
index 80e2dd7fe..9c4ca01ff 100644
--- a/src/test/ui/derives/deriving-copyclone.stderr
+++ b/tests/ui/derives/deriving-copyclone.stderr
@@ -10,7 +10,7 @@ note: required for `B<C>` to implement `Copy`
   --> $DIR/deriving-copyclone.rs:9:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_copy`
   --> $DIR/deriving-copyclone.rs:18:15
    |
@@ -34,7 +34,7 @@ note: required for `B<C>` to implement `Clone`
   --> $DIR/deriving-copyclone.rs:9:16
    |
 LL | #[derive(Copy, Clone)]
-   |                ^^^^^
+   |                ^^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_clone`
   --> $DIR/deriving-copyclone.rs:19:16
    |
@@ -58,7 +58,7 @@ note: required for `B<D>` to implement `Copy`
   --> $DIR/deriving-copyclone.rs:9:10
    |
 LL | #[derive(Copy, Clone)]
-   |          ^^^^
+   |          ^^^^ unsatisfied trait bound introduced in this `derive` macro
 note: required by a bound in `is_copy`
   --> $DIR/deriving-copyclone.rs:18:15
    |
diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.rs b/tests/ui/derives/deriving-meta-empty-trait-list.rs
index 0306ce717..0306ce717 100644
--- a/src/test/ui/derives/deriving-meta-empty-trait-list.rs
+++ b/tests/ui/derives/deriving-meta-empty-trait-list.rs
diff --git a/src/test/ui/derives/deriving-meta-unknown-trait.rs b/tests/ui/derives/deriving-meta-unknown-trait.rs
index 6463a7664..6463a7664 100644
--- a/src/test/ui/derives/deriving-meta-unknown-trait.rs
+++ b/tests/ui/derives/deriving-meta-unknown-trait.rs
diff --git a/tests/ui/derives/deriving-meta-unknown-trait.stderr b/tests/ui/derives/deriving-meta-unknown-trait.stderr
new file mode 100644
index 000000000..053d34f68
--- /dev/null
+++ b/tests/ui/derives/deriving-meta-unknown-trait.stderr
@@ -0,0 +1,20 @@
+error: cannot find derive macro `Eqr` in this scope
+  --> $DIR/deriving-meta-unknown-trait.rs:1:10
+   |
+LL | #[derive(Eqr)]
+   |          ^^^ help: a derive macro with a similar name exists: `Eq`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
+   |
+   = note: similarly named derive macro `Eq` defined here
+
+error: cannot find derive macro `Eqr` in this scope
+  --> $DIR/deriving-meta-unknown-trait.rs:1:10
+   |
+LL | #[derive(Eqr)]
+   |          ^^^ help: a derive macro with a similar name exists: `Eq`
+  --> $SRC_DIR/core/src/cmp.rs:LL:COL
+   |
+   = note: similarly named derive macro `Eq` defined here
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs b/tests/ui/derives/deriving-no-inner-impl-error-message.rs
index b3ce31bf0..b3ce31bf0 100644
--- a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs
+++ b/tests/ui/derives/deriving-no-inner-impl-error-message.rs
diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr b/tests/ui/derives/deriving-no-inner-impl-error-message.stderr
index ef8c44caa..ef8c44caa 100644
--- a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr
+++ b/tests/ui/derives/deriving-no-inner-impl-error-message.stderr
diff --git a/src/test/ui/derives/deriving-non-type.rs b/tests/ui/derives/deriving-non-type.rs
index 9afffa900..9afffa900 100644
--- a/src/test/ui/derives/deriving-non-type.rs
+++ b/tests/ui/derives/deriving-non-type.rs
diff --git a/src/test/ui/derives/deriving-non-type.stderr b/tests/ui/derives/deriving-non-type.stderr
index ef7ef54d1..ef7ef54d1 100644
--- a/src/test/ui/derives/deriving-non-type.stderr
+++ b/tests/ui/derives/deriving-non-type.stderr
diff --git a/src/test/ui/derives/deriving-primitive.rs b/tests/ui/derives/deriving-primitive.rs
index 1173eca64..1173eca64 100644
--- a/src/test/ui/derives/deriving-primitive.rs
+++ b/tests/ui/derives/deriving-primitive.rs
diff --git a/src/test/ui/derives/deriving-primitive.stderr b/tests/ui/derives/deriving-primitive.stderr
index ca64c9ee7..ca64c9ee7 100644
--- a/src/test/ui/derives/deriving-primitive.stderr
+++ b/tests/ui/derives/deriving-primitive.stderr
diff --git a/src/test/ui/derives/deriving-with-repr-packed.rs b/tests/ui/derives/deriving-with-repr-packed.rs
index 3884e3977..3884e3977 100644
--- a/src/test/ui/derives/deriving-with-repr-packed.rs
+++ b/tests/ui/derives/deriving-with-repr-packed.rs
diff --git a/src/test/ui/derives/deriving-with-repr-packed.stderr b/tests/ui/derives/deriving-with-repr-packed.stderr
index 0ad800c39..0ad800c39 100644
--- a/src/test/ui/derives/deriving-with-repr-packed.stderr
+++ b/tests/ui/derives/deriving-with-repr-packed.stderr
diff --git a/src/test/ui/derives/issue-36617.rs b/tests/ui/derives/issue-36617.rs
index 08f293d2e..08f293d2e 100644
--- a/src/test/ui/derives/issue-36617.rs
+++ b/tests/ui/derives/issue-36617.rs
diff --git a/src/test/ui/derives/issue-36617.stderr b/tests/ui/derives/issue-36617.stderr
index 9cc0a29b0..9cc0a29b0 100644
--- a/src/test/ui/derives/issue-36617.stderr
+++ b/tests/ui/derives/issue-36617.stderr
diff --git a/src/test/ui/derives/issue-43023.rs b/tests/ui/derives/issue-43023.rs
index c0208e680..c0208e680 100644
--- a/src/test/ui/derives/issue-43023.rs
+++ b/tests/ui/derives/issue-43023.rs
diff --git a/src/test/ui/derives/issue-43023.stderr b/tests/ui/derives/issue-43023.stderr
index 007eb2595..007eb2595 100644
--- a/src/test/ui/derives/issue-43023.stderr
+++ b/tests/ui/derives/issue-43023.stderr
diff --git a/src/test/ui/derives/issue-91492.rs b/tests/ui/derives/issue-91492.rs
index df792f118..df792f118 100644
--- a/src/test/ui/derives/issue-91492.rs
+++ b/tests/ui/derives/issue-91492.rs
diff --git a/src/test/ui/derives/issue-91492.stderr b/tests/ui/derives/issue-91492.stderr
index fbd48336d..cee30ac50 100644
--- a/src/test/ui/derives/issue-91492.stderr
+++ b/tests/ui/derives/issue-91492.stderr
@@ -42,8 +42,13 @@ LL | struct Object<T, A>(T, A);
 LL |     foo.use_clone();
    |         ^^^^^^^^^ method cannot be called on `Object<NoDerives, SomeDerives>` due to unsatisfied trait bounds
    |
-   = note: the following trait bounds were not satisfied:
-           `NoDerives: Clone`
+note: trait bound `NoDerives: Clone` was not satisfied
+  --> $DIR/issue-91492.rs:18:9
+   |
+LL | impl<T: Clone, A: Default> Object<T, A> {
+   |         ^^^^^              ------------
+   |         |
+   |         unsatisfied trait bound introduced here
 help: consider annotating `NoDerives` with `#[derive(Clone)]`
    |
 LL | #[derive(Clone)]
diff --git a/src/test/ui/derives/issue-91550.rs b/tests/ui/derives/issue-91550.rs
index 56fd5ffa8..56fd5ffa8 100644
--- a/src/test/ui/derives/issue-91550.rs
+++ b/tests/ui/derives/issue-91550.rs
diff --git a/tests/ui/derives/issue-91550.stderr b/tests/ui/derives/issue-91550.stderr
new file mode 100644
index 000000000..af03f0e5e
--- /dev/null
+++ b/tests/ui/derives/issue-91550.stderr
@@ -0,0 +1,131 @@
+error[E0599]: the method `insert` exists for struct `HashSet<Value>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:8:8
+   |
+LL | struct Value(u32);
+   | ------------
+   | |
+   | doesn't satisfy `Value: Eq`
+   | doesn't satisfy `Value: Hash`
+   | doesn't satisfy `Value: PartialEq`
+...
+LL |     hs.insert(Value(0));
+   |        ^^^^^^
+   |
+   = note: the following trait bounds were not satisfied:
+           `Value: Eq`
+           `Value: PartialEq`
+           which is required by `Value: Eq`
+           `Value: Hash`
+help: consider annotating `Value` with `#[derive(Eq, Hash, PartialEq)]`
+   |
+LL | #[derive(Eq, Hash, PartialEq)]
+   |
+
+error[E0599]: the method `use_eq` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:26:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: PartialEq`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_eq` not found for this struct
+...
+LL |     foo.use_eq();
+   |         ^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: trait bound `NoDerives: Eq` was not satisfied
+  --> $DIR/issue-91550.rs:15:9
+   |
+LL | impl<T: Eq> Object<T> {
+   |         ^^  ---------
+   |         |
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Eq`
+help: consider annotating `NoDerives` with `#[derive(Eq, PartialEq)]`
+   |
+LL | #[derive(Eq, PartialEq)]
+   |
+
+error[E0599]: the method `use_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:27:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: Ord`
+   | doesn't satisfy `NoDerives: PartialEq`
+   | doesn't satisfy `NoDerives: PartialOrd`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_ord` not found for this struct
+...
+LL |     foo.use_ord();
+   |         ^^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: trait bound `NoDerives: Ord` was not satisfied
+  --> $DIR/issue-91550.rs:18:9
+   |
+LL | impl<T: Ord> Object<T> {
+   |         ^^^  ---------
+   |         |
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialOrd`
+           which is required by `NoDerives: Ord`
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: Eq`
+           which is required by `NoDerives: Ord`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
+   |
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
+   |
+
+error[E0599]: the method `use_ord_and_partial_ord` exists for struct `Object<NoDerives>`, but its trait bounds were not satisfied
+  --> $DIR/issue-91550.rs:28:9
+   |
+LL | pub struct NoDerives;
+   | --------------------
+   | |
+   | doesn't satisfy `NoDerives: Eq`
+   | doesn't satisfy `NoDerives: Ord`
+   | doesn't satisfy `NoDerives: PartialEq`
+   | doesn't satisfy `NoDerives: PartialOrd`
+LL |
+LL | struct Object<T>(T);
+   | ---------------- method `use_ord_and_partial_ord` not found for this struct
+...
+LL |     foo.use_ord_and_partial_ord();
+   |         ^^^^^^^^^^^^^^^^^^^^^^^ method cannot be called on `Object<NoDerives>` due to unsatisfied trait bounds
+   |
+note: the following trait bounds were not satisfied:
+      `NoDerives: Ord`
+      `NoDerives: PartialOrd`
+  --> $DIR/issue-91550.rs:21:9
+   |
+LL | impl<T: Ord + PartialOrd> Object<T> {
+   |         ^^^   ^^^^^^^^^^  ---------
+   |         |     |
+   |         |     unsatisfied trait bound introduced here
+   |         unsatisfied trait bound introduced here
+   = note: the following trait bounds were not satisfied:
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: Eq`
+           which is required by `NoDerives: Ord`
+           `NoDerives: PartialEq`
+           which is required by `NoDerives: PartialOrd`
+help: consider annotating `NoDerives` with `#[derive(Eq, Ord, PartialEq, PartialOrd)]`
+   |
+LL | #[derive(Eq, Ord, PartialEq, PartialOrd)]
+   |
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/derives/issue-97343.rs b/tests/ui/derives/issue-97343.rs
index 6f0e4d55a..6f0e4d55a 100644
--- a/src/test/ui/derives/issue-97343.rs
+++ b/tests/ui/derives/issue-97343.rs
diff --git a/src/test/ui/derives/issue-97343.stderr b/tests/ui/derives/issue-97343.stderr
index e83bbb5b6..e83bbb5b6 100644
--- a/src/test/ui/derives/issue-97343.stderr
+++ b/tests/ui/derives/issue-97343.stderr