rust-lang · rust-bors · Apr 26, 2026 · Apr 22, 2026 · Apr 22, 2026 · Apr 22, 2026
diff --git a/tests/ui/README.md b/tests/ui/README.md
@@ -420,10 +420,6 @@ Tests for quality of diagnostics involving suppression of cascading errors in so
 
 Tests for built-in derive macros (`Debug`, `Clone`, etc.) when used in conjunction with built-in `#[derive(..)]` attributes.
 
-## `tests/ui/deriving/`: Derive Macro
-
-**FIXME**: Coalesce with `tests/ui/derives`.
-
 ## `tests/ui/dest-prop/` Destination Propagation
 
 **FIXME**: Contains a single test for the `DestProp` mir-opt, should probably be rehomed.

diff --git a/tests/ui/deriving/auxiliary/derive-no-std.rs → tests/ui/derives/auxiliary/derive-no-std.rs b/tests/ui/deriving/auxiliary/derive-no-std.rs → tests/ui/derives/auxiliary/derive-no-std.rs
diff --git a/tests/ui/derives/auxiliary/rustc-serialize.rs b/tests/ui/derives/auxiliary/rustc-serialize.rs
diff --git a/...s/ui/derives/clone-vector-element-size.rs → ...s/clone-copy/clone-vector-element-size.rs b/...s/ui/derives/clone-vector-element-size.rs → ...s/clone-copy/clone-vector-element-size.rs
diff --git a/...i/derives/copy-drop-mutually-exclusive.rs → ...lone-copy/copy-drop-mutually-exclusive.rs b/...i/derives/copy-drop-mutually-exclusive.rs → ...lone-copy/copy-drop-mutually-exclusive.rs
diff --git a/...rives/copy-drop-mutually-exclusive.stderr → ...-copy/copy-drop-mutually-exclusive.stderr b/...rives/copy-drop-mutually-exclusive.stderr → ...-copy/copy-drop-mutually-exclusive.stderr
diff --git a/tests/ui/derives/derive-clone-basic.rs → .../derives/clone-copy/derive-clone-basic.rs b/tests/ui/derives/derive-clone-basic.rs → .../derives/clone-copy/derive-clone-basic.rs
diff --git a/tests/ui/derives/derives-span-Clone.rs → .../derives/clone-copy/derives-span-Clone.rs b/tests/ui/derives/derives-span-Clone.rs → .../derives/clone-copy/derives-span-Clone.rs
diff --git a/tests/ui/derives/derives-span-Clone.stderr → ...ives/clone-copy/derives-span-Clone.stderr b/tests/ui/derives/derives-span-Clone.stderr → ...ives/clone-copy/derives-span-Clone.stderr
diff --git a/tests/ui/derives/deriving-copyclone.rs → .../derives/clone-copy/deriving-copyclone.rs b/tests/ui/derives/deriving-copyclone.rs → .../derives/clone-copy/deriving-copyclone.rs
diff --git a/tests/ui/derives/deriving-copyclone.stderr → ...ives/clone-copy/deriving-copyclone.stderr b/tests/ui/derives/deriving-copyclone.stderr → ...ives/clone-copy/deriving-copyclone.stderr
diff --git a/...uplicate-derive-copy-clone-diagnostics.rs → ...uplicate-derive-copy-clone-diagnostics.rs b/...uplicate-derive-copy-clone-diagnostics.rs → ...uplicate-derive-copy-clone-diagnostics.rs
diff --git a/...cate-derive-copy-clone-diagnostics.stderr → ...cate-derive-copy-clone-diagnostics.stderr b/...cate-derive-copy-clone-diagnostics.stderr → ...cate-derive-copy-clone-diagnostics.stderr
diff --git a/tests/ui/deriving/deriving-copyclone.rs → ...ives/clone-copy/misbehaving-clone-impl.rs b/tests/ui/deriving/deriving-copyclone.rs → ...ives/clone-copy/misbehaving-clone-impl.rs
diff --git a/.../deriving/auxiliary/another-proc-macro.rs → ...cepointee/auxiliary/another-proc-macro.rs b/.../deriving/auxiliary/another-proc-macro.rs → ...cepointee/auxiliary/another-proc-macro.rs
diff --git a/.../ui/deriving/auxiliary/malicious-macro.rs → ...oercepointee/auxiliary/malicious-macro.rs b/.../ui/deriving/auxiliary/malicious-macro.rs → ...oercepointee/auxiliary/malicious-macro.rs
diff --git a/.../ui/deriving/built-in-proc-macro-scope.rs → ...oercepointee/built-in-proc-macro-scope.rs b/.../ui/deriving/built-in-proc-macro-scope.rs → ...oercepointee/built-in-proc-macro-scope.rs
diff --git a/...deriving/built-in-proc-macro-scope.stdout → ...epointee/built-in-proc-macro-scope.stdout b/...deriving/built-in-proc-macro-scope.stdout → ...epointee/built-in-proc-macro-scope.stdout
diff --git a/...ing/coerce-pointee-bounds-issue-127647.rs → ...tee/coerce-pointee-bounds-issue-127647.rs b/...ing/coerce-pointee-bounds-issue-127647.rs → ...tee/coerce-pointee-bounds-issue-127647.rs
diff --git a/...iving/deriving-coerce-pointee-expanded.rs → ...intee/deriving-coerce-pointee-expanded.rs b/...iving/deriving-coerce-pointee-expanded.rs → ...intee/deriving-coerce-pointee-expanded.rs
diff --git a/...g/deriving-coerce-pointee-expanded.stdout → ...e/deriving-coerce-pointee-expanded.stdout b/...g/deriving-coerce-pointee-expanded.stdout → ...e/deriving-coerce-pointee-expanded.stdout
diff --git a/...i/deriving/deriving-coerce-pointee-neg.rs → ...rcepointee/deriving-coerce-pointee-neg.rs b/...i/deriving/deriving-coerce-pointee-neg.rs → ...rcepointee/deriving-coerce-pointee-neg.rs
diff --git a/...riving/deriving-coerce-pointee-neg.stderr → ...ointee/deriving-coerce-pointee-neg.stderr b/...riving/deriving-coerce-pointee-neg.stderr → ...ointee/deriving-coerce-pointee-neg.stderr
diff --git a/tests/ui/deriving/deriving-coerce-pointee.rs → .../coercepointee/deriving-coerce-pointee.rs b/tests/ui/deriving/deriving-coerce-pointee.rs → .../coercepointee/deriving-coerce-pointee.rs
diff --git a/...i/deriving/proc-macro-attribute-mixing.rs → ...rcepointee/proc-macro-attribute-mixing.rs b/...i/deriving/proc-macro-attribute-mixing.rs → ...rcepointee/proc-macro-attribute-mixing.rs
diff --git a/...riving/proc-macro-attribute-mixing.stdout → ...ointee/proc-macro-attribute-mixing.stdout b/...riving/proc-macro-attribute-mixing.stdout → ...ointee/proc-macro-attribute-mixing.stdout
diff --git a/.../ui/derives/derive-Debug-enum-variants.rs → ...rives/debug/derive-Debug-enum-variants.rs b/.../ui/derives/derive-Debug-enum-variants.rs → ...rives/debug/derive-Debug-enum-variants.rs
diff --git a/...i/derives/derive-Debug-use-ufcs-struct.rs → ...ves/debug/derive-Debug-use-ufcs-struct.rs b/...i/derives/derive-Debug-use-ufcs-struct.rs → ...ves/debug/derive-Debug-use-ufcs-struct.rs
diff --git a/...ui/derives/derive-Debug-use-ufcs-tuple.rs → ...ives/debug/derive-Debug-use-ufcs-tuple.rs b/...ui/derives/derive-Debug-use-ufcs-tuple.rs → ...ives/debug/derive-Debug-use-ufcs-tuple.rs
diff --git a/tests/ui/deriving/deriving-show-2.rs → tests/ui/derives/debug/derive-debug-2.rs b/tests/ui/deriving/deriving-show-2.rs → tests/ui/derives/debug/derive-debug-2.rs
diff --git a/...ves/derive-debug-generic-with-lifetime.rs → ...bug/derive-debug-generic-with-lifetime.rs b/...ves/derive-debug-generic-with-lifetime.rs → ...bug/derive-debug-generic-with-lifetime.rs
diff --git a/...ves/derive-debug-newtype-unsized-slice.rs → ...bug/derive-debug-newtype-unsized-slice.rs b/...ves/derive-debug-newtype-unsized-slice.rs → ...bug/derive-debug-newtype-unsized-slice.rs
diff --git a/.../derives/derive-debug-uninhabited-enum.rs → ...es/debug/derive-debug-uninhabited-enum.rs b/.../derives/derive-debug-uninhabited-enum.rs → ...es/debug/derive-debug-uninhabited-enum.rs
diff --git a/...ives/derive-debug-uninhabited-enum.stderr → ...ebug/derive-debug-uninhabited-enum.stderr b/...ives/derive-debug-uninhabited-enum.stderr → ...ebug/derive-debug-uninhabited-enum.stderr
diff --git a/tests/ui/deriving/deriving-show.rs → tests/ui/derives/debug/derive-debug.rs b/tests/ui/deriving/deriving-show.rs → tests/ui/derives/debug/derive-debug.rs
diff --git a/tests/ui/derives/derives-span-Debug.rs → tests/ui/derives/debug/derives-span-Debug.rs b/tests/ui/derives/derives-span-Debug.rs → tests/ui/derives/debug/derives-span-Debug.rs
diff --git a/tests/ui/derives/derives-span-Debug.stderr → ...i/derives/debug/derives-span-Debug.stderr b/tests/ui/derives/derives-span-Debug.stderr → ...i/derives/debug/derives-span-Debug.stderr
diff --git a/tests/ui/derives/nonsense-input-to-debug.rs → .../derives/debug/nonsense-input-to-debug.rs b/tests/ui/derives/nonsense-input-to-debug.rs → .../derives/debug/nonsense-input-to-debug.rs
diff --git a/...ui/derives/nonsense-input-to-debug.stderr → ...ives/debug/nonsense-input-to-debug.stderr b/...ui/derives/nonsense-input-to-debug.stderr → ...ives/debug/nonsense-input-to-debug.stderr
diff --git a/tests/ui/derives/derives-span-Default.rs → ...i/derives/default/derives-span-Default.rs b/tests/ui/derives/derives-span-Default.rs → ...i/derives/default/derives-span-Default.rs
diff --git a/tests/ui/derives/derives-span-Default.stderr → ...rives/default/derives-span-Default.stderr b/tests/ui/derives/derives-span-Default.stderr → ...rives/default/derives-span-Default.stderr
diff --git a/tests/ui/deriving/deriving-default-box.rs → ...i/derives/default/deriving-default-box.rs b/tests/ui/deriving/deriving-default-box.rs → ...i/derives/default/deriving-default-box.rs
diff --git a/tests/ui/deriving/deriving-default-enum.rs → .../derives/default/deriving-default-enum.rs b/tests/ui/deriving/deriving-default-enum.rs → .../derives/default/deriving-default-enum.rs
diff --git a/tests/ui/deriving/multiple-defaults.rs → ...s/ui/derives/default/multiple-defaults.rs b/tests/ui/deriving/multiple-defaults.rs → ...s/ui/derives/default/multiple-defaults.rs
diff --git a/tests/ui/deriving/multiple-defaults.stderr → .../derives/default/multiple-defaults.stderr b/tests/ui/deriving/multiple-defaults.stderr → .../derives/default/multiple-defaults.stderr
diff --git a/tests/ui/deriving/derive-no-std.rs → tests/ui/derives/derive-no-std.rs b/tests/ui/deriving/derive-no-std.rs → tests/ui/derives/derive-no-std.rs
diff --git a/tests/ui/deriving/deriving-all-codegen.rs → tests/ui/derives/deriving-all-codegen.rs b/tests/ui/deriving/deriving-all-codegen.rs → tests/ui/derives/deriving-all-codegen.rs
diff --git a/...s/ui/deriving/deriving-all-codegen.stdout → tests/ui/derives/deriving-all-codegen.stdout b/...s/ui/deriving/deriving-all-codegen.stdout → tests/ui/derives/deriving-all-codegen.stdout
diff --git a/.../ui/deriving/deriving-associated-types.rs → ...s/ui/derives/deriving-associated-types.rs b/.../ui/deriving/deriving-associated-types.rs → ...s/ui/derives/deriving-associated-types.rs
diff --git a/...ui/deriving/deriving-from-wrong-target.rs → .../ui/derives/deriving-from-wrong-target.rs b/...ui/deriving/deriving-from-wrong-target.rs → .../ui/derives/deriving-from-wrong-target.rs
diff --git a/...eriving/deriving-from-wrong-target.stderr → ...derives/deriving-from-wrong-target.stderr b/...eriving/deriving-from-wrong-target.stderr → ...derives/deriving-from-wrong-target.stderr
diff --git a/tests/ui/deriving/deriving-from.rs → tests/ui/derives/deriving-from.rs b/tests/ui/deriving/deriving-from.rs → tests/ui/derives/deriving-from.rs
diff --git a/tests/ui/deriving/deriving-hash.rs → tests/ui/derives/deriving-hash.rs b/tests/ui/deriving/deriving-hash.rs → tests/ui/derives/deriving-hash.rs
diff --git a/tests/ui/deriving/deriving-in-fn.rs → tests/ui/derives/deriving-in-fn.rs b/tests/ui/deriving/deriving-in-fn.rs → tests/ui/derives/deriving-in-fn.rs
diff --git a/tests/ui/deriving/deriving-with-helper.rs → tests/ui/derives/deriving-with-helper.rs b/tests/ui/deriving/deriving-with-helper.rs → tests/ui/derives/deriving-with-helper.rs
diff --git a/.../ui/deriving/deriving-with-repr-packed.rs → ...ui/derives/deriving-with-repr-packed-3.rs b/.../ui/deriving/deriving-with-repr-packed.rs → ...ui/derives/deriving-with-repr-packed-3.rs
diff --git a/...i/derives/derive-eq-check-all-variants.rs → ...es/eq-ord/derive-eq-check-all-variants.rs b/...i/derives/derive-eq-check-all-variants.rs → ...es/eq-ord/derive-eq-check-all-variants.rs
diff --git a/...rives/derive-eq-check-all-variants.stderr → ...q-ord/derive-eq-check-all-variants.stderr b/...rives/derive-eq-check-all-variants.stderr → ...q-ord/derive-eq-check-all-variants.stderr
diff --git a/.../derive-partial-ord-discriminant-64bit.rs → .../derive-partial-ord-discriminant-64bit.rs b/.../derive-partial-ord-discriminant-64bit.rs → .../derive-partial-ord-discriminant-64bit.rs
diff --git a/...erives/derive-partial-ord-discriminant.rs → ...eq-ord/derive-partial-ord-discriminant.rs b/...erives/derive-partial-ord-discriminant.rs → ...eq-ord/derive-partial-ord-discriminant.rs
diff --git a/tests/ui/derives/derive-partial-ord.rs → ...s/ui/derives/eq-ord/derive-partial-ord.rs b/tests/ui/derives/derive-partial-ord.rs → ...s/ui/derives/eq-ord/derive-partial-ord.rs
diff --git a/...deriving/derive-partialord-correctness.rs → ...s/eq-ord/derive-partialord-correctness.rs b/...deriving/derive-partialord-correctness.rs → ...s/eq-ord/derive-partialord-correctness.rs
diff --git a/tests/ui/derives/derives-span-Eq.rs → tests/ui/derives/eq-ord/derives-span-Eq.rs b/tests/ui/derives/derives-span-Eq.rs → tests/ui/derives/eq-ord/derives-span-Eq.rs
diff --git a/tests/ui/derives/derives-span-Eq.stderr → .../ui/derives/eq-ord/derives-span-Eq.stderr b/tests/ui/derives/derives-span-Eq.stderr → .../ui/derives/eq-ord/derives-span-Eq.stderr
diff --git a/tests/ui/derives/derives-span-Ord.rs → tests/ui/derives/eq-ord/derives-span-Ord.rs b/tests/ui/derives/derives-span-Ord.rs → tests/ui/derives/eq-ord/derives-span-Ord.rs
diff --git a/tests/ui/derives/derives-span-Ord.stderr → ...ui/derives/eq-ord/derives-span-Ord.stderr b/tests/ui/derives/derives-span-Ord.stderr → ...ui/derives/eq-ord/derives-span-Ord.stderr
diff --git a/tests/ui/derives/derives-span-PartialEq.rs → .../derives/eq-ord/derives-span-PartialEq.rs b/tests/ui/derives/derives-span-PartialEq.rs → .../derives/eq-ord/derives-span-PartialEq.rs
diff --git a/.../ui/derives/derives-span-PartialEq.stderr → ...ives/eq-ord/derives-span-PartialEq.stderr b/.../ui/derives/derives-span-PartialEq.stderr → ...ives/eq-ord/derives-span-PartialEq.stderr
diff --git a/tests/ui/derives/derives-span-PartialOrd.rs → ...derives/eq-ord/derives-span-PartialOrd.rs b/tests/ui/derives/derives-span-PartialOrd.rs → ...derives/eq-ord/derives-span-PartialOrd.rs
diff --git a/...ui/derives/derives-span-PartialOrd.stderr → ...ves/eq-ord/derives-span-PartialOrd.stderr b/...ui/derives/derives-span-PartialOrd.stderr → ...ves/eq-ord/derives-span-PartialOrd.stderr
diff --git a/.../ui/deriving/deriving-cmp-generic-enum.rs → ...rives/eq-ord/deriving-cmp-generic-enum.rs b/.../ui/deriving/deriving-cmp-generic-enum.rs → ...rives/eq-ord/deriving-cmp-generic-enum.rs
diff --git a/...iving/deriving-cmp-generic-struct-enum.rs → ...q-ord/deriving-cmp-generic-struct-enum.rs b/...iving/deriving-cmp-generic-struct-enum.rs → ...q-ord/deriving-cmp-generic-struct-enum.rs
diff --git a/...i/deriving/deriving-cmp-generic-struct.rs → ...ves/eq-ord/deriving-cmp-generic-struct.rs b/...i/deriving/deriving-cmp-generic-struct.rs → ...ves/eq-ord/deriving-cmp-generic-struct.rs
diff --git a/...ving/deriving-cmp-generic-tuple-struct.rs → ...-ord/deriving-cmp-generic-tuple-struct.rs b/...ving/deriving-cmp-generic-tuple-struct.rs → ...-ord/deriving-cmp-generic-tuple-struct.rs
diff --git a/.../ui/deriving/deriving-cmp-shortcircuit.rs → ...rives/eq-ord/deriving-cmp-shortcircuit.rs b/.../ui/deriving/deriving-cmp-shortcircuit.rs → ...rives/eq-ord/deriving-cmp-shortcircuit.rs
diff --git a/...i/deriving/deriving-eq-ord-boxed-slice.rs → ...ves/eq-ord/deriving-eq-ord-boxed-slice.rs b/...i/deriving/deriving-eq-ord-boxed-slice.rs → ...ves/eq-ord/deriving-eq-ord-boxed-slice.rs
diff --git a/...eriving-self-lifetime-totalord-totaleq.rs → ...eriving-self-lifetime-totalord-totaleq.rs b/...eriving-self-lifetime-totalord-totaleq.rs → ...eriving-self-lifetime-totalord-totaleq.rs
diff --git a/...not-suggest-calling-fn-in-derive-macro.rs → ...not-suggest-calling-fn-in-derive-macro.rs b/...not-suggest-calling-fn-in-derive-macro.rs → ...not-suggest-calling-fn-in-derive-macro.rs
diff --git a/...suggest-calling-fn-in-derive-macro.stderr → ...suggest-calling-fn-in-derive-macro.stderr b/...suggest-calling-fn-in-derive-macro.stderr → ...suggest-calling-fn-in-derive-macro.stderr
diff --git a/...eriving/internal_eq_trait_method_impls.rs → .../eq-ord/internal_eq_trait_method_impls.rs b/...eriving/internal_eq_trait_method_impls.rs → .../eq-ord/internal_eq_trait_method_impls.rs
diff --git a/...ing/internal_eq_trait_method_impls.stderr → ...ord/internal_eq_trait_method_impls.stderr b/...ing/internal_eq_trait_method_impls.stderr → ...ord/internal_eq_trait_method_impls.stderr
diff --git a/...erives/invalid-derive-comparison-34229.rs → ...eq-ord/invalid-derive-comparison-34229.rs b/...erives/invalid-derive-comparison-34229.rs → ...eq-ord/invalid-derive-comparison-34229.rs
diff --git a/...es/invalid-derive-comparison-34229.stderr → ...rd/invalid-derive-comparison-34229.stderr b/...es/invalid-derive-comparison-34229.stderr → ...rd/invalid-derive-comparison-34229.stderr
diff --git a/tests/ui/deriving/deriving-enum-single-variant.rs b/tests/ui/deriving/deriving-enum-single-variant.rs
diff --git a/tests/ui/deriving/deriving-in-macro.rs b/tests/ui/deriving/deriving-in-macro.rs
diff --git a/tests/ui/deriving/deriving-meta-multiple.rs b/tests/ui/deriving/deriving-meta-multiple.rs
diff --git a/tests/ui/deriving/deriving-meta.rs b/tests/ui/deriving/deriving-meta.rs
diff --git a/tests/ui/deriving/deriving-via-extension-c-enum.rs b/tests/ui/deriving/deriving-via-extension-c-enum.rs
diff --git a/tests/ui/deriving/deriving-via-extension-enum.rs b/tests/ui/deriving/deriving-via-extension-enum.rs
diff --git a/tests/ui/deriving/deriving-via-extension-hash-enum.rs b/tests/ui/deriving/deriving-via-extension-hash-enum.rs
diff --git a/tests/ui/deriving/deriving-via-extension-hash-struct.rs b/tests/ui/deriving/deriving-via-extension-hash-struct.rs
diff --git a/tests/ui/deriving/deriving-via-extension-struct-empty.rs b/tests/ui/deriving/deriving-via-extension-struct-empty.rs
diff --git a/tests/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/tests/ui/deriving/deriving-via-extension-struct-tuple.rs b/tests/ui/deriving/deriving-via-extension-struct-tuple.rs
diff --git a/tests/ui/deriving/deriving-via-extension-struct.rs b/tests/ui/deriving/deriving-via-extension-struct.rs
diff --git a/tests/ui/deriving/deriving-via-extension-type-params.rs b/tests/ui/deriving/deriving-via-extension-type-params.rs
diff --git a/triagebot.toml b/triagebot.toml
@@ -1283,7 +1283,7 @@ Please ensure that if you've changed the output:
 """
 cc = ["@aDotInTheVoid", "@obi1kenobi"]
 
-[mentions."tests/ui/deriving/deriving-all-codegen.stdout"]
+[mentions."tests/ui/derives/deriving-all-codegen.stdout"]
 message = "Changes to the code generated for builtin derived traits."
 cc = ["@nnethercote"]