move remaining files from deriving to derives

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.

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"]