diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.rs b/src/test/ui/associated-consts/associated-const-ambiguity-report.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-ambiguity-report.rs
rename to src/test/ui/associated-consts/associated-const-ambiguity-report.rs
diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.stderr b/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-ambiguity-report.stderr
rename to src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
diff --git a/src/test/ui/associated-const/associated-const-array-len.rs b/src/test/ui/associated-consts/associated-const-array-len.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-array-len.rs
rename to src/test/ui/associated-consts/associated-const-array-len.rs
diff --git a/src/test/ui/associated-const/associated-const-array-len.stderr b/src/test/ui/associated-consts/associated-const-array-len.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-array-len.stderr
rename to src/test/ui/associated-consts/associated-const-array-len.stderr
diff --git a/src/test/ui/associated-const/associated-const-dead-code.rs b/src/test/ui/associated-consts/associated-const-dead-code.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-dead-code.rs
rename to src/test/ui/associated-consts/associated-const-dead-code.rs
diff --git a/src/test/ui/associated-const/associated-const-dead-code.stderr b/src/test/ui/associated-consts/associated-const-dead-code.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-dead-code.stderr
rename to src/test/ui/associated-consts/associated-const-dead-code.stderr
diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.rs b/src/test/ui/associated-consts/associated-const-generic-obligations.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-generic-obligations.rs
rename to src/test/ui/associated-consts/associated-const-generic-obligations.rs
diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.stderr b/src/test/ui/associated-consts/associated-const-generic-obligations.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-generic-obligations.stderr
rename to src/test/ui/associated-consts/associated-const-generic-obligations.stderr
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs b/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs
rename to src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.rs
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr b/src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr
rename to src/test/ui/associated-consts/associated-const-impl-wrong-lifetime.stderr
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.rs b/src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-type.rs
rename to src/test/ui/associated-consts/associated-const-impl-wrong-type.rs
diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr b/src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-impl-wrong-type.stderr
rename to src/test/ui/associated-consts/associated-const-impl-wrong-type.stderr
diff --git a/src/test/ui/associated-const/associated-const-in-trait.rs b/src/test/ui/associated-consts/associated-const-in-trait.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-in-trait.rs
rename to src/test/ui/associated-consts/associated-const-in-trait.rs
diff --git a/src/test/ui/associated-const/associated-const-in-trait.stderr b/src/test/ui/associated-consts/associated-const-in-trait.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-in-trait.stderr
rename to src/test/ui/associated-consts/associated-const-in-trait.stderr
diff --git a/src/test/ui/associated-const/associated-const-no-item.rs b/src/test/ui/associated-consts/associated-const-no-item.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-no-item.rs
rename to src/test/ui/associated-consts/associated-const-no-item.rs
diff --git a/src/test/ui/associated-const/associated-const-no-item.stderr b/src/test/ui/associated-consts/associated-const-no-item.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-no-item.stderr
rename to src/test/ui/associated-consts/associated-const-no-item.stderr
diff --git a/src/test/ui/associated-const/associated-const-private-impl.rs b/src/test/ui/associated-consts/associated-const-private-impl.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-private-impl.rs
rename to src/test/ui/associated-consts/associated-const-private-impl.rs
diff --git a/src/test/ui/associated-const/associated-const-private-impl.stderr b/src/test/ui/associated-consts/associated-const-private-impl.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-private-impl.stderr
rename to src/test/ui/associated-consts/associated-const-private-impl.stderr
diff --git a/src/test/ui/associated-const/associated-const-trait-bound.rs b/src/test/ui/associated-consts/associated-const-trait-bound.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-trait-bound.rs
rename to src/test/ui/associated-consts/associated-const-trait-bound.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arms.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arms.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arms.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arms.stderr
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays-2.stderr
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs b/src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays.rs
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays.rs
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr b/src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
similarity index 100%
rename from src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr
rename to src/test/ui/associated-consts/associated-const-type-parameter-arrays.stderr
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.rs b/src/test/ui/associated-consts/defaults-cyclic-fail.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-fail.rs
rename to src/test/ui/associated-consts/defaults-cyclic-fail.rs
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.stderr b/src/test/ui/associated-consts/defaults-cyclic-fail.stderr
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-fail.stderr
rename to src/test/ui/associated-consts/defaults-cyclic-fail.stderr
diff --git a/src/test/ui/associated-const/defaults-cyclic-pass.rs b/src/test/ui/associated-consts/defaults-cyclic-pass.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-cyclic-pass.rs
rename to src/test/ui/associated-consts/defaults-cyclic-pass.rs
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.rs b/src/test/ui/associated-consts/defaults-not-assumed-fail.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-fail.rs
rename to src/test/ui/associated-consts/defaults-not-assumed-fail.rs
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.stderr b/src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-fail.stderr
rename to src/test/ui/associated-consts/defaults-not-assumed-fail.stderr
diff --git a/src/test/ui/associated-const/defaults-not-assumed-pass.rs b/src/test/ui/associated-consts/defaults-not-assumed-pass.rs
similarity index 100%
rename from src/test/ui/associated-const/defaults-not-assumed-pass.rs
rename to src/test/ui/associated-consts/defaults-not-assumed-pass.rs
diff --git a/src/test/ui/associated-const/issue-63496.rs b/src/test/ui/associated-consts/issue-63496.rs
similarity index 100%
rename from src/test/ui/associated-const/issue-63496.rs
rename to src/test/ui/associated-consts/issue-63496.rs
diff --git a/src/test/ui/associated-const/issue-63496.stderr b/src/test/ui/associated-consts/issue-63496.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-63496.stderr
rename to src/test/ui/associated-consts/issue-63496.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.noopt.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.noopt.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.noopt.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.rs b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
similarity index 100%
rename from src/test/ui/associated-const/issue-69020-assoc-const-arith-overflow.rs
rename to src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
diff --git a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs b/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs
rename to src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.rs
diff --git a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr b/src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr
rename to src/test/ui/associated-types/associated-type-projection-ambig-between-bound-and-where-clause.stderr
diff --git a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs b/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs
rename to src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.rs
diff --git a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr b/src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr
rename to src/test/ui/associated-types/associated-type-projection-from-multiple-supertraits.stderr
diff --git a/src/test/ui/associated-type/associated-type-projection-from-supertrait.rs b/src/test/ui/associated-types/associated-type-projection-from-supertrait.rs
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-from-supertrait.rs
rename to src/test/ui/associated-types/associated-type-projection-from-supertrait.rs
diff --git a/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr b/src/test/ui/associated-types/associated-type-projection-from-supertrait.stderr
similarity index 100%
rename from src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr
rename to src/test/ui/associated-types/associated-type-projection-from-supertrait.stderr
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.rs b/src/test/ui/generics/generic-arg-mismatch-recover.rs
similarity index 100%
rename from src/test/ui/generic/generic-arg-mismatch-recover.rs
rename to src/test/ui/generics/generic-arg-mismatch-recover.rs
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generics/generic-arg-mismatch-recover.stderr
similarity index 100%
rename from src/test/ui/generic/generic-arg-mismatch-recover.stderr
rename to src/test/ui/generics/generic-arg-mismatch-recover.stderr
diff --git a/src/test/ui/generic/generic-extern-lifetime.rs b/src/test/ui/generics/generic-extern-lifetime.rs
similarity index 100%
rename from src/test/ui/generic/generic-extern-lifetime.rs
rename to src/test/ui/generics/generic-extern-lifetime.rs
diff --git a/src/test/ui/generic/generic-extern-lifetime.stderr b/src/test/ui/generics/generic-extern-lifetime.stderr
similarity index 100%
rename from src/test/ui/generic/generic-extern-lifetime.stderr
rename to src/test/ui/generics/generic-extern-lifetime.stderr
diff --git a/src/test/ui/generic/generic-extern.rs b/src/test/ui/generics/generic-extern.rs
similarity index 100%
rename from src/test/ui/generic/generic-extern.rs
rename to src/test/ui/generics/generic-extern.rs
diff --git a/src/test/ui/generic/generic-extern.stderr b/src/test/ui/generics/generic-extern.stderr
similarity index 100%
rename from src/test/ui/generic/generic-extern.stderr
rename to src/test/ui/generics/generic-extern.stderr
diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.rs b/src/test/ui/generics/generic-impl-less-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-impl-less-params-with-defaults.rs
rename to src/test/ui/generics/generic-impl-less-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr b/src/test/ui/generics/generic-impl-less-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-impl-less-params-with-defaults.stderr
rename to src/test/ui/generics/generic-impl-less-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.rs b/src/test/ui/generics/generic-impl-more-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-impl-more-params-with-defaults.rs
rename to src/test/ui/generics/generic-impl-more-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generics/generic-impl-more-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-impl-more-params-with-defaults.stderr
rename to src/test/ui/generics/generic-impl-more-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.rs b/src/test/ui/generics/generic-lifetime-trait-impl.rs
similarity index 100%
rename from src/test/ui/generic/generic-lifetime-trait-impl.rs
rename to src/test/ui/generics/generic-lifetime-trait-impl.rs
diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.stderr b/src/test/ui/generics/generic-lifetime-trait-impl.stderr
similarity index 100%
rename from src/test/ui/generic/generic-lifetime-trait-impl.stderr
rename to src/test/ui/generics/generic-lifetime-trait-impl.stderr
diff --git a/src/test/ui/generic/generic-no-mangle.fixed b/src/test/ui/generics/generic-no-mangle.fixed
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.fixed
rename to src/test/ui/generics/generic-no-mangle.fixed
diff --git a/src/test/ui/generic/generic-no-mangle.rs b/src/test/ui/generics/generic-no-mangle.rs
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.rs
rename to src/test/ui/generics/generic-no-mangle.rs
diff --git a/src/test/ui/generic/generic-no-mangle.stderr b/src/test/ui/generics/generic-no-mangle.stderr
similarity index 100%
rename from src/test/ui/generic/generic-no-mangle.stderr
rename to src/test/ui/generics/generic-no-mangle.stderr
diff --git a/src/test/ui/generic/generic-non-trailing-defaults.rs b/src/test/ui/generics/generic-non-trailing-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-non-trailing-defaults.rs
rename to src/test/ui/generics/generic-non-trailing-defaults.rs
diff --git a/src/test/ui/generic/generic-non-trailing-defaults.stderr b/src/test/ui/generics/generic-non-trailing-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-non-trailing-defaults.stderr
rename to src/test/ui/generics/generic-non-trailing-defaults.stderr
diff --git a/src/test/ui/generic/generic-param-attrs.rs b/src/test/ui/generics/generic-param-attrs.rs
similarity index 100%
rename from src/test/ui/generic/generic-param-attrs.rs
rename to src/test/ui/generics/generic-param-attrs.rs
diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.rs b/src/test/ui/generics/generic-type-less-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-less-params-with-defaults.rs
rename to src/test/ui/generics/generic-type-less-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.stderr b/src/test/ui/generics/generic-type-less-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-less-params-with-defaults.stderr
rename to src/test/ui/generics/generic-type-less-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.rs b/src/test/ui/generics/generic-type-more-params-with-defaults.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-more-params-with-defaults.rs
rename to src/test/ui/generics/generic-type-more-params-with-defaults.rs
diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr b/src/test/ui/generics/generic-type-more-params-with-defaults.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-more-params-with-defaults.stderr
rename to src/test/ui/generics/generic-type-more-params-with-defaults.stderr
diff --git a/src/test/ui/generic/generic-type-params-forward-mention.rs b/src/test/ui/generics/generic-type-params-forward-mention.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-params-forward-mention.rs
rename to src/test/ui/generics/generic-type-params-forward-mention.rs
diff --git a/src/test/ui/generic/generic-type-params-forward-mention.stderr b/src/test/ui/generics/generic-type-params-forward-mention.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-params-forward-mention.stderr
rename to src/test/ui/generics/generic-type-params-forward-mention.stderr
diff --git a/src/test/ui/generic/generic-type-params-name-repr.rs b/src/test/ui/generics/generic-type-params-name-repr.rs
similarity index 100%
rename from src/test/ui/generic/generic-type-params-name-repr.rs
rename to src/test/ui/generics/generic-type-params-name-repr.rs
diff --git a/src/test/ui/generic/generic-type-params-name-repr.stderr b/src/test/ui/generics/generic-type-params-name-repr.stderr
similarity index 100%
rename from src/test/ui/generic/generic-type-params-name-repr.stderr
rename to src/test/ui/generics/generic-type-params-name-repr.stderr
diff --git a/src/test/ui/generic/param-in-ct-in-ty-param-default.rs b/src/test/ui/generics/param-in-ct-in-ty-param-default.rs
similarity index 100%
rename from src/test/ui/generic/param-in-ct-in-ty-param-default.rs
rename to src/test/ui/generics/param-in-ct-in-ty-param-default.rs
diff --git a/src/test/ui/generic/param-in-ct-in-ty-param-default.stderr b/src/test/ui/generics/param-in-ct-in-ty-param-default.stderr
similarity index 100%
rename from src/test/ui/generic/param-in-ct-in-ty-param-default.stderr
rename to src/test/ui/generics/param-in-ct-in-ty-param-default.stderr
diff --git a/src/test/ui/mod/mod_file_aux.rs b/src/test/ui/modules_and_files_visibility/mod_file_aux.rs
similarity index 100%
rename from src/test/ui/mod/mod_file_aux.rs
rename to src/test/ui/modules_and_files_visibility/mod_file_aux.rs
diff --git a/src/test/ui/mod/mod_file_correct_spans.rs b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs
similarity index 100%
rename from src/test/ui/mod/mod_file_correct_spans.rs
rename to src/test/ui/modules_and_files_visibility/mod_file_correct_spans.rs
diff --git a/src/test/ui/mod/mod_file_correct_spans.stderr b/src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr
similarity index 100%
rename from src/test/ui/mod/mod_file_correct_spans.stderr
rename to src/test/ui/modules_and_files_visibility/mod_file_correct_spans.stderr
diff --git a/src/test/ui/mod/mod_file_disambig.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig.rs
similarity index 100%
rename from src/test/ui/mod/mod_file_disambig.rs
rename to src/test/ui/modules_and_files_visibility/mod_file_disambig.rs
diff --git a/src/test/ui/mod/mod_file_disambig.stderr b/src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr
similarity index 100%
rename from src/test/ui/mod/mod_file_disambig.stderr
rename to src/test/ui/modules_and_files_visibility/mod_file_disambig.stderr
diff --git a/src/test/ui/mod/mod_file_disambig_aux.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs
similarity index 100%
rename from src/test/ui/mod/mod_file_disambig_aux.rs
rename to src/test/ui/modules_and_files_visibility/mod_file_disambig_aux.rs
diff --git a/src/test/ui/mod/mod_file_disambig_aux/mod.rs b/src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs
similarity index 100%
rename from src/test/ui/mod/mod_file_disambig_aux/mod.rs
rename to src/test/ui/modules_and_files_visibility/mod_file_disambig_aux/mod.rs
diff --git a/src/test/ui/rfc1445/allow-hide-behind-direct-unsafe-ptr-embedded.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
similarity index 100%
rename from src/test/ui/rfc1445/allow-hide-behind-direct-unsafe-ptr-embedded.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
diff --git a/src/test/ui/rfc1445/allow-hide-behind-direct-unsafe-ptr-param.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
similarity index 100%
rename from src/test/ui/rfc1445/allow-hide-behind-direct-unsafe-ptr-param.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
diff --git a/src/test/ui/rfc1445/allow-hide-behind-indirect-unsafe-ptr-embedded.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
similarity index 100%
rename from src/test/ui/rfc1445/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
diff --git a/src/test/ui/rfc1445/allow-hide-behind-indirect-unsafe-ptr-param.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
similarity index 100%
rename from src/test/ui/rfc1445/allow-hide-behind-indirect-unsafe-ptr-param.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
diff --git a/src/test/ui/rfc1445/allow-use-behind-cousin-variant.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
similarity index 100%
rename from src/test/ui/rfc1445/allow-use-behind-cousin-variant.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-direct-struct-embedded.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-direct-struct-param.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
similarity index 100%
rename from src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
diff --git a/src/test/ui/rfc1445/feature-gate.no_gate.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
similarity index 100%
rename from src/test/ui/rfc1445/feature-gate.no_gate.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
diff --git a/src/test/ui/rfc1445/feature-gate.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
similarity index 100%
rename from src/test/ui/rfc1445/feature-gate.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
diff --git a/src/test/ui/rfc1445/feature-gate.with_gate.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
similarity index 100%
rename from src/test/ui/rfc1445/feature-gate.with_gate.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
diff --git a/src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
similarity index 100%
rename from src/test/ui/rfc1445/fn-ptr-is-structurally-matchable.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
diff --git a/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
similarity index 100%
rename from src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
similarity index 100%
rename from src/test/ui/rfc1445/issue-61188-match-slice-forbidden-without-eq.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
similarity index 100%
rename from src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
similarity index 100%
rename from src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc1445/issue-63479-match-fnptr.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
similarity index 100%
rename from src/test/ui/rfc1445/issue-63479-match-fnptr.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
diff --git a/src/test/ui/rfc1445/issue-63479-match-fnptr.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
similarity index 100%
rename from src/test/ui/rfc1445/issue-63479-match-fnptr.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
diff --git a/src/test/ui/rfc1445/match-empty-array-allowed-without-eq-issue-62336.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
similarity index 100%
rename from src/test/ui/rfc1445/match-empty-array-allowed-without-eq-issue-62336.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
diff --git a/src/test/ui/rfc1445/match-forbidden-without-eq.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
similarity index 100%
rename from src/test/ui/rfc1445/match-forbidden-without-eq.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc1445/match-forbidden-without-eq.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
similarity index 100%
rename from src/test/ui/rfc1445/match-forbidden-without-eq.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
similarity index 100%
rename from src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
diff --git a/src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
similarity index 100%
rename from src/test/ui/rfc1445/match-nonempty-array-forbidden-without-eq.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
diff --git a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
similarity index 100%
rename from src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
diff --git a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
similarity index 100%
rename from src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
diff --git a/src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
similarity index 100%
rename from src/test/ui/rfc1445/phantom-data-is-structurally-matchable.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
diff --git a/src/test/ui/rfc1717/missing-link-attr.rs b/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs
similarity index 100%
rename from src/test/ui/rfc1717/missing-link-attr.rs
rename to src/test/ui/rfc-1717-dllimport/missing-link-attr.rs
diff --git a/src/test/ui/rfc1717/missing-link-attr.stderr b/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr
similarity index 100%
rename from src/test/ui/rfc1717/missing-link-attr.stderr
rename to src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr
diff --git a/src/test/ui/rfc1717/multiple-renames.rs b/src/test/ui/rfc-1717-dllimport/multiple-renames.rs
similarity index 100%
rename from src/test/ui/rfc1717/multiple-renames.rs
rename to src/test/ui/rfc-1717-dllimport/multiple-renames.rs
diff --git a/src/test/ui/rfc1717/multiple-renames.stderr b/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr
similarity index 100%
rename from src/test/ui/rfc1717/multiple-renames.stderr
rename to src/test/ui/rfc-1717-dllimport/multiple-renames.stderr
diff --git a/src/test/ui/rfc1717/rename-to-empty.rs b/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs
similarity index 100%
rename from src/test/ui/rfc1717/rename-to-empty.rs
rename to src/test/ui/rfc-1717-dllimport/rename-to-empty.rs
diff --git a/src/test/ui/rfc1717/rename-to-empty.stderr b/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr
similarity index 100%
rename from src/test/ui/rfc1717/rename-to-empty.stderr
rename to src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr