52 files changed, 6 insertions, 8 deletions
diff --git a/src/test/ui/deriving/auxiliary/derive-no-std.rs b/tests/ui/deriving/auxiliary/derive-no-std.rs
index 3893dc1be..3893dc1be 100644
--- a/src/test/ui/deriving/auxiliary/derive-no-std.rs
+++ b/tests/ui/deriving/auxiliary/derive-no-std.rs
diff --git a/src/test/ui/deriving/derive-no-std.rs b/tests/ui/deriving/derive-no-std.rs
index 74c73b99c..74c73b99c 100644
--- a/src/test/ui/deriving/derive-no-std.rs
+++ b/tests/ui/deriving/derive-no-std.rs
diff --git a/src/test/ui/deriving/derive-partialord-correctness.rs b/tests/ui/deriving/derive-partialord-correctness.rs
index 36763eda1..36763eda1 100644
--- a/src/test/ui/deriving/derive-partialord-correctness.rs
+++ b/tests/ui/deriving/derive-partialord-correctness.rs
diff --git a/src/test/ui/deriving/deriving-all-codegen.rs b/tests/ui/deriving/deriving-all-codegen.rs
index ba7809413..ba7809413 100644
--- a/src/test/ui/deriving/deriving-all-codegen.rs
+++ b/tests/ui/deriving/deriving-all-codegen.rs
diff --git a/src/test/ui/deriving/deriving-all-codegen.stdout b/tests/ui/deriving/deriving-all-codegen.stdout
index a63cbd4ca..e6ee11a78 100644
--- a/src/test/ui/deriving/deriving-all-codegen.stdout
+++ b/tests/ui/deriving/deriving-all-codegen.stdout
@@ -731,11 +731,12 @@ impl ::core::marker::Copy for Fieldless { }
 #[automatically_derived]
 impl ::core::fmt::Debug for Fieldless {
     fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
-        match self {
-            Fieldless::A => ::core::fmt::Formatter::write_str(f, "A"),
-            Fieldless::B => ::core::fmt::Formatter::write_str(f, "B"),
-            Fieldless::C => ::core::fmt::Formatter::write_str(f, "C"),
-        }
+        ::core::fmt::Formatter::write_str(f,
+            match self {
+                Fieldless::A => "A",
+                Fieldless::B => "B",
+                Fieldless::C => "C",
+            })
     }
 }
 #[automatically_derived]
diff --git a/src/test/ui/deriving/deriving-associated-types.rs b/tests/ui/deriving/deriving-associated-types.rs
index 4b1cbe80c..4b1cbe80c 100644
--- a/src/test/ui/deriving/deriving-associated-types.rs
+++ b/tests/ui/deriving/deriving-associated-types.rs
diff --git a/src/test/ui/deriving/deriving-bounds.rs b/tests/ui/deriving/deriving-bounds.rs
index f0b921d0e..f0b921d0e 100644
--- a/src/test/ui/deriving/deriving-bounds.rs
+++ b/tests/ui/deriving/deriving-bounds.rs
diff --git a/src/test/ui/deriving/deriving-clone-array.rs b/tests/ui/deriving/deriving-clone-array.rs
index 4569749df..4569749df 100644
--- a/src/test/ui/deriving/deriving-clone-array.rs
+++ b/tests/ui/deriving/deriving-clone-array.rs
diff --git a/src/test/ui/deriving/deriving-clone-enum.rs b/tests/ui/deriving/deriving-clone-enum.rs
index 09e749740..09e749740 100644
--- a/src/test/ui/deriving/deriving-clone-enum.rs
+++ b/tests/ui/deriving/deriving-clone-enum.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-enum.rs b/tests/ui/deriving/deriving-clone-generic-enum.rs
index a344d7fc4..a344d7fc4 100644
--- a/src/test/ui/deriving/deriving-clone-generic-enum.rs
+++ b/tests/ui/deriving/deriving-clone-generic-enum.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-struct.rs b/tests/ui/deriving/deriving-clone-generic-struct.rs
index 4374d1594..4374d1594 100644
--- a/src/test/ui/deriving/deriving-clone-generic-struct.rs
+++ b/tests/ui/deriving/deriving-clone-generic-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs b/tests/ui/deriving/deriving-clone-generic-tuple-struct.rs
index 3480ccc10..3480ccc10 100644
--- a/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-clone-generic-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-struct.rs b/tests/ui/deriving/deriving-clone-struct.rs
index b93cbe5f8..b93cbe5f8 100644
--- a/src/test/ui/deriving/deriving-clone-struct.rs
+++ b/tests/ui/deriving/deriving-clone-struct.rs
diff --git a/src/test/ui/deriving/deriving-clone-tuple-struct.rs b/tests/ui/deriving/deriving-clone-tuple-struct.rs
index 7ad3f0347..7ad3f0347 100644
--- a/src/test/ui/deriving/deriving-clone-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-clone-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-enum.rs b/tests/ui/deriving/deriving-cmp-generic-enum.rs
index 88da4bd06..88da4bd06 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-enum.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-enum.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs b/tests/ui/deriving/deriving-cmp-generic-struct-enum.rs
index eeaf2ff7e..eeaf2ff7e 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-struct-enum.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-struct.rs b/tests/ui/deriving/deriving-cmp-generic-struct.rs
index 538caf439..538caf439 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-struct.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs b/tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs
index 79f58d456..79f58d456 100644
--- a/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs
+++ b/tests/ui/deriving/deriving-cmp-generic-tuple-struct.rs
diff --git a/src/test/ui/deriving/deriving-cmp-shortcircuit.rs b/tests/ui/deriving/deriving-cmp-shortcircuit.rs
index 140373e95..140373e95 100644
--- a/src/test/ui/deriving/deriving-cmp-shortcircuit.rs
+++ b/tests/ui/deriving/deriving-cmp-shortcircuit.rs
diff --git a/src/test/ui/deriving/deriving-copyclone.rs b/tests/ui/deriving/deriving-copyclone.rs
index f8403b1fe..f8403b1fe 100644
--- a/src/test/ui/deriving/deriving-copyclone.rs
+++ b/tests/ui/deriving/deriving-copyclone.rs
diff --git a/src/test/ui/deriving/deriving-default-box.rs b/tests/ui/deriving/deriving-default-box.rs
index b71e11496..b71e11496 100644
--- a/src/test/ui/deriving/deriving-default-box.rs
+++ b/tests/ui/deriving/deriving-default-box.rs
diff --git a/src/test/ui/deriving/deriving-default-enum.rs b/tests/ui/deriving/deriving-default-enum.rs
index 1c7a501ed..1c7a501ed 100644
--- a/src/test/ui/deriving/deriving-default-enum.rs
+++ b/tests/ui/deriving/deriving-default-enum.rs
diff --git a/src/test/ui/deriving/deriving-enum-single-variant.rs b/tests/ui/deriving/deriving-enum-single-variant.rs
index 1c5979c07..1c5979c07 100644
--- a/src/test/ui/deriving/deriving-enum-single-variant.rs
+++ b/tests/ui/deriving/deriving-enum-single-variant.rs
diff --git a/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs b/tests/ui/deriving/deriving-eq-ord-boxed-slice.rs
index 5b4b09836..5b4b09836 100644
--- a/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs
+++ b/tests/ui/deriving/deriving-eq-ord-boxed-slice.rs
diff --git a/src/test/ui/deriving/deriving-hash.rs b/tests/ui/deriving/deriving-hash.rs
index 16738ec4a..16738ec4a 100644
--- a/src/test/ui/deriving/deriving-hash.rs
+++ b/tests/ui/deriving/deriving-hash.rs
diff --git a/src/test/ui/deriving/deriving-in-fn.rs b/tests/ui/deriving/deriving-in-fn.rs
index 07f91d059..07f91d059 100644
--- a/src/test/ui/deriving/deriving-in-fn.rs
+++ b/tests/ui/deriving/deriving-in-fn.rs
diff --git a/src/test/ui/deriving/deriving-in-macro.rs b/tests/ui/deriving/deriving-in-macro.rs
index 46e8e3783..46e8e3783 100644
--- a/src/test/ui/deriving/deriving-in-macro.rs
+++ b/tests/ui/deriving/deriving-in-macro.rs
diff --git a/src/test/ui/deriving/deriving-meta-multiple.rs b/tests/ui/deriving/deriving-meta-multiple.rs
index ad255be8d..ad255be8d 100644
--- a/src/test/ui/deriving/deriving-meta-multiple.rs
+++ b/tests/ui/deriving/deriving-meta-multiple.rs
diff --git a/src/test/ui/deriving/deriving-meta.rs b/tests/ui/deriving/deriving-meta.rs
index f2ff4f535..f2ff4f535 100644
--- a/src/test/ui/deriving/deriving-meta.rs
+++ b/tests/ui/deriving/deriving-meta.rs
diff --git a/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs b/tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
index e01b5a26f..e01b5a26f 100644
--- a/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
+++ b/tests/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
diff --git a/src/test/ui/deriving/deriving-show-2.rs b/tests/ui/deriving/deriving-show-2.rs
index 13d124ed4..13d124ed4 100644
--- a/src/test/ui/deriving/deriving-show-2.rs
+++ b/tests/ui/deriving/deriving-show-2.rs
diff --git a/src/test/ui/deriving/deriving-show.rs b/tests/ui/deriving/deriving-show.rs
index eb3a8948f..eb3a8948f 100644
--- a/src/test/ui/deriving/deriving-show.rs
+++ b/tests/ui/deriving/deriving-show.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-c-enum.rs b/tests/ui/deriving/deriving-via-extension-c-enum.rs
index 7fa1a69d7..7fa1a69d7 100644
--- a/src/test/ui/deriving/deriving-via-extension-c-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-c-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-enum.rs b/tests/ui/deriving/deriving-via-extension-enum.rs
index 6b58fd966..6b58fd966 100644
--- a/src/test/ui/deriving/deriving-via-extension-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-hash-enum.rs b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
index 2d1ca05f4..2d1ca05f4 100644
--- a/src/test/ui/deriving/deriving-via-extension-hash-enum.rs
+++ b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-hash-struct.rs b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
index c4037dc27..c4037dc27 100644
--- a/src/test/ui/deriving/deriving-via-extension-hash-struct.rs
+++ b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-empty.rs b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
index 9fb250e84..9fb250e84 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-empty.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs b/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
index b6e6f136c..b6e6f136c 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
index e84906c96..e84906c96 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-struct.rs b/tests/ui/deriving/deriving-via-extension-struct.rs
index f4d8b16a0..f4d8b16a0 100644
--- a/src/test/ui/deriving/deriving-via-extension-struct.rs
+++ b/tests/ui/deriving/deriving-via-extension-struct.rs
diff --git a/src/test/ui/deriving/deriving-via-extension-type-params.rs b/tests/ui/deriving/deriving-via-extension-type-params.rs
index a5dec8ee1..a5dec8ee1 100644
--- a/src/test/ui/deriving/deriving-via-extension-type-params.rs
+++ b/tests/ui/deriving/deriving-via-extension-type-params.rs
diff --git a/src/test/ui/deriving/deriving-with-helper.rs b/tests/ui/deriving/deriving-with-helper.rs
index 1c30b0b6f..1c30b0b6f 100644
--- a/src/test/ui/deriving/deriving-with-helper.rs
+++ b/tests/ui/deriving/deriving-with-helper.rs
diff --git a/src/test/ui/deriving/deriving-with-repr-packed.rs b/tests/ui/deriving/deriving-with-repr-packed.rs
index 8ce444be1..8ce444be1 100644
--- a/src/test/ui/deriving/deriving-with-repr-packed.rs
+++ b/tests/ui/deriving/deriving-with-repr-packed.rs
diff --git a/src/test/ui/deriving/issue-103157.rs b/tests/ui/deriving/issue-103157.rs
index 52b4c7898..52b4c7898 100644
--- a/src/test/ui/deriving/issue-103157.rs
+++ b/tests/ui/deriving/issue-103157.rs
diff --git a/src/test/ui/deriving/issue-103157.stderr b/tests/ui/deriving/issue-103157.stderr
index ee3528fe1..b18e1e509 100644
--- a/src/test/ui/deriving/issue-103157.stderr
+++ b/tests/ui/deriving/issue-103157.stderr
@@ -20,9 +20,6 @@ LL |     Float(Option<f64>),
    = note: required for `Option<f64>` to implement `Eq`
 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)
 
 error: aborting due to previous error
diff --git a/src/test/ui/deriving/issue-105101.rs b/tests/ui/deriving/issue-105101.rs
index 1a377feb9..1a377feb9 100644
--- a/src/test/ui/deriving/issue-105101.rs
+++ b/tests/ui/deriving/issue-105101.rs
diff --git a/src/test/ui/deriving/issue-105101.stderr b/tests/ui/deriving/issue-105101.stderr
index 0f6f67043..0f6f67043 100644
--- a/src/test/ui/deriving/issue-105101.stderr
+++ b/tests/ui/deriving/issue-105101.stderr
diff --git a/src/test/ui/deriving/issue-19358.rs b/tests/ui/deriving/issue-19358.rs
index 3970a4155..3970a4155 100644
--- a/src/test/ui/deriving/issue-19358.rs
+++ b/tests/ui/deriving/issue-19358.rs
diff --git a/src/test/ui/deriving/issue-3935.rs b/tests/ui/deriving/issue-3935.rs
index e98d68e0e..e98d68e0e 100644
--- a/src/test/ui/deriving/issue-3935.rs
+++ b/tests/ui/deriving/issue-3935.rs
diff --git a/src/test/ui/deriving/issue-58319.rs b/tests/ui/deriving/issue-58319.rs
index 8041bd5bb..8041bd5bb 100644
--- a/src/test/ui/deriving/issue-58319.rs
+++ b/tests/ui/deriving/issue-58319.rs
diff --git a/src/test/ui/deriving/issue-6341.rs b/tests/ui/deriving/issue-6341.rs
index 1be1394df..1be1394df 100644
--- a/src/test/ui/deriving/issue-6341.rs
+++ b/tests/ui/deriving/issue-6341.rs
diff --git a/src/test/ui/deriving/issue-89188-gat-hrtb.rs b/tests/ui/deriving/issue-89188-gat-hrtb.rs
index e8118f0c6..e8118f0c6 100644
--- a/src/test/ui/deriving/issue-89188-gat-hrtb.rs
+++ b/tests/ui/deriving/issue-89188-gat-hrtb.rs