diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs diff --git a/src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr b/src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr similarity index 100% rename from src/test/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr rename to src/test/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr diff --git a/src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs b/src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs similarity index 100% rename from src/test/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs rename to src/test/ui/rfcs/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.rs b/src/test/ui/rfcs/rfc-1717-dllimport/missing-link-attr.rs similarity index 100% rename from src/test/ui/rfc-1717-dllimport/missing-link-attr.rs rename to src/test/ui/rfcs/rfc-1717-dllimport/missing-link-attr.rs diff --git a/src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr b/src/test/ui/rfcs/rfc-1717-dllimport/missing-link-attr.stderr similarity index 100% rename from src/test/ui/rfc-1717-dllimport/missing-link-attr.stderr rename to src/test/ui/rfcs/rfc-1717-dllimport/missing-link-attr.stderr diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.rs b/src/test/ui/rfcs/rfc-1717-dllimport/multiple-renames.rs similarity index 100% rename from src/test/ui/rfc-1717-dllimport/multiple-renames.rs rename to src/test/ui/rfcs/rfc-1717-dllimport/multiple-renames.rs diff --git a/src/test/ui/rfc-1717-dllimport/multiple-renames.stderr b/src/test/ui/rfcs/rfc-1717-dllimport/multiple-renames.stderr similarity index 100% rename from src/test/ui/rfc-1717-dllimport/multiple-renames.stderr rename to src/test/ui/rfcs/rfc-1717-dllimport/multiple-renames.stderr diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.rs b/src/test/ui/rfcs/rfc-1717-dllimport/rename-to-empty.rs similarity index 100% rename from src/test/ui/rfc-1717-dllimport/rename-to-empty.rs rename to src/test/ui/rfcs/rfc-1717-dllimport/rename-to-empty.rs diff --git a/src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr b/src/test/ui/rfcs/rfc-1717-dllimport/rename-to-empty.stderr similarity index 100% rename from src/test/ui/rfc-1717-dllimport/rename-to-empty.stderr rename to src/test/ui/rfcs/rfc-1717-dllimport/rename-to-empty.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-ok.rs similarity index 100% rename from src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-ok.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs diff --git a/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-ok.rs similarity index 100% rename from src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-ok.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr similarity index 100% rename from src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr rename to src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/const.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/const.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/const.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/const.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/const.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/const.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-fail.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/enum.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-fail.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-fail.stderr similarity index 88% rename from src/test/ui/rfc-2005-default-binding-mode/enum.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-fail.stderr index d6a89006bc0fb..621503a3fb958 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr +++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-fail.stderr @@ -1,17 +1,17 @@ error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:9:5 + --> $DIR/enum-fail.rs:9:5 | LL | *x += 1; | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:13:9 + --> $DIR/enum-fail.rs:13:9 | LL | *x += 1; | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:19:9 + --> $DIR/enum-fail.rs:19:9 | LL | *x += 1; | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-pass.rs similarity index 100% rename from src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/enum-pass.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for-fail.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/for.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/for-fail.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for-fail.stderr similarity index 93% rename from src/test/ui/rfc-2005-default-binding-mode/for.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/for-fail.stderr index 9cc20a7bf3144..f52d529e9bdde 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr +++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for-fail.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of a shared reference - --> $DIR/for.rs:6:23 + --> $DIR/for-fail.rs:6:23 | LL | for (n, mut m) in &tups { | ----- ^^^^^ diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for-pass.rs similarity index 100% rename from src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/for-pass.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-fail.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/lit.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-fail.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-fail.stderr similarity index 92% rename from src/test/ui/rfc-2005-default-binding-mode/lit.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-fail.stderr index 6d18a39606ccf..19c3ef7f7e2b7 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr +++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-fail.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/lit.rs:7:13 + --> $DIR/lit-fail.rs:7:13 | LL | match &s { | -- this expression has type `&&str` @@ -10,7 +10,7 @@ LL | "abc" => true, found reference `&'static str` error[E0308]: mismatched types - --> $DIR/lit.rs:16:9 + --> $DIR/lit-fail.rs:16:9 | LL | match &s { | -- this expression has type `&&[u8]` diff --git a/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-pass.rs similarity index 100% rename from src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/lit-pass.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.stderr similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.stderr diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice-non-exhaustive.rs similarity index 100% rename from src/test/ui/rfc-2005-default-binding-mode/slice.rs rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/slice-non-exhaustive.rs diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr b/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice-non-exhaustive.stderr similarity index 90% rename from src/test/ui/rfc-2005-default-binding-mode/slice.stderr rename to src/test/ui/rfcs/rfc-2005-default-binding-mode/slice-non-exhaustive.stderr index 18d8f5481c9fb..71a48aea12958 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr +++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice-non-exhaustive.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `&[]` not covered - --> $DIR/slice.rs:4:11 + --> $DIR/slice-non-exhaustive.rs:4:11 | LL | match sl { | ^^ pattern `&[]` not covered diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/monovariants.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/monovariants.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-exhaustive.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-exhaustive.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/enum.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/enum.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/enum.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/enum.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/enum.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/enum.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/enum_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/struct.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/struct.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/struct.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/struct.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/struct.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/struct.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/struct.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/struct.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/structs_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/structs_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/variant.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/variant.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/variant.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.stderr b/src/test/ui/rfcs/rfc-2008-non-exhaustive/variant.stderr similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/variant.stderr rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/variant.stderr diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/variants_fictive_visibility.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/variants_fictive_visibility.rs diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs b/src/test/ui/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs similarity index 100% rename from src/test/ui/rfc-2008-non-exhaustive/variants_same_crate.rs rename to src/test/ui/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs b/src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs similarity index 100% rename from src/test/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs rename to src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs b/src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs similarity index 100% rename from src/test/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs rename to src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs diff --git a/src/test/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs b/src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs similarity index 100% rename from src/test/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs rename to src/test/ui/rfcs/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs diff --git a/src/test/ui/rfc-2091-track-caller/call-chain.rs b/src/test/ui/rfcs/rfc-2091-track-caller/call-chain.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/call-chain.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/call-chain.rs diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs b/src/test/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs b/src/test/ui/rfcs/rfc-2091-track-caller/caller-location-intrinsic.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/caller-location-intrinsic.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/caller-location-intrinsic.rs diff --git a/src/test/ui/rfc-2091-track-caller/const-caller-location.rs b/src/test/ui/rfcs/rfc-2091-track-caller/const-caller-location.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/const-caller-location.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/const-caller-location.rs diff --git a/src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs b/src/test/ui/rfcs/rfc-2091-track-caller/diverging-caller-location.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/diverging-caller-location.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/diverging-caller-location.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs b/src/test/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-odd-syntax.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-odd-syntax.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.stderr diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.stderr diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.rs b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-main.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-main.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-main.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-with-main.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-main.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-main.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-main.stderr diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.rs b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-naked.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-naked.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-naked.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-with-naked.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-naked.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-naked.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-naked.stderr diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.rs b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-start.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-start.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-start.rs diff --git a/src/test/ui/rfc-2091-track-caller/error-with-start.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/error-with-start.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/error-with-start.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/error-with-start.stderr diff --git a/src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs b/src/test/ui/rfcs/rfc-2091-track-caller/intrinsic-wrapper.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/intrinsic-wrapper.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/intrinsic-wrapper.rs diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.rs b/src/test/ui/rfcs/rfc-2091-track-caller/only-for-fns.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/only-for-fns.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/only-for-fns.rs diff --git a/src/test/ui/rfc-2091-track-caller/only-for-fns.stderr b/src/test/ui/rfcs/rfc-2091-track-caller/only-for-fns.stderr similarity index 100% rename from src/test/ui/rfc-2091-track-caller/only-for-fns.stderr rename to src/test/ui/rfcs/rfc-2091-track-caller/only-for-fns.stderr diff --git a/src/test/ui/rfc-2091-track-caller/pass.rs b/src/test/ui/rfcs/rfc-2091-track-caller/pass.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/pass.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/pass.rs diff --git a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs b/src/test/ui/rfcs/rfc-2091-track-caller/std-panic-locations.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/std-panic-locations.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/std-panic-locations.rs diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs b/src/test/ui/rfcs/rfc-2091-track-caller/track-caller-attribute.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/track-caller-attribute.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/track-caller-attribute.rs diff --git a/src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs b/src/test/ui/rfcs/rfc-2091-track-caller/track-caller-ffi.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/track-caller-ffi.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/track-caller-ffi.rs diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs b/src/test/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs diff --git a/src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs b/src/test/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/tracked-fn-ptr.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr.rs diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs b/src/test/ui/rfcs/rfc-2091-track-caller/tracked-trait-impls.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/tracked-trait-impls.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/tracked-trait-impls.rs diff --git a/src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs b/src/test/ui/rfcs/rfc-2091-track-caller/tracked-trait-obj.rs similarity index 100% rename from src/test/ui/rfc-2091-track-caller/tracked-trait-obj.rs rename to src/test/ui/rfcs/rfc-2091-track-caller/tracked-trait-obj.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/cross-crate.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/cross-crate.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/cross-crate.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/cross-crate.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/cross-crate.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/enum.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/enum.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/enum.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/enum.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/enum.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/enum.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-union.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-union.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-union.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-union.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/explicit-union.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/infer-static.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/infer-static.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/infer-static.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/infer-static.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/infer-static.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/infer-static.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/infer-static.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/infer-static.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/issue-54467.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/issue-54467.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/issue-54467.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/issue-54467.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-enum.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-enum.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-enum.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-enum.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-enum.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-regions.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-regions.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-regions.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-regions.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-regions.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-structs.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-structs.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-structs.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-structs.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-structs.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-union.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-union.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-union.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/nested-union.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/nested-union.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/nested-union.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/privacy.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/privacy.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/privacy.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/privacy.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/projection.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/projection.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/projection.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/projection.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/projection.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/projection.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/reference.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/reference.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/reference.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/reference.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/reference.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/reference.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/self-dyn.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/self-dyn.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/self-dyn.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/self-dyn.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/self-dyn.stderr diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.rs b/src/test/ui/rfcs/rfc-2093-infer-outlives/self-structs.rs similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/self-structs.rs rename to src/test/ui/rfcs/rfc-2093-infer-outlives/self-structs.rs diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr b/src/test/ui/rfcs/rfc-2093-infer-outlives/self-structs.stderr similarity index 100% rename from src/test/ui/rfc-2093-infer-outlives/self-structs.stderr rename to src/test/ui/rfcs/rfc-2093-infer-outlives/self-structs.stderr diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs b/src/test/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.rs similarity index 100% rename from src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs rename to src/test/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.rs diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/src/test/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr similarity index 100% rename from src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr rename to src/test/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/src/test/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.rs similarity index 100% rename from src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs rename to src/test/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.rs diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/src/test/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr similarity index 100% rename from src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr rename to src/test/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.stderr similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.stderr diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.stderr similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.stderr diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.stderr similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.stderr diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.stderr similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.stderr diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.rs similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/src/test/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.stderr similarity index 100% rename from src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr rename to src/test/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.stderr diff --git a/src/test/ui/rfc-2294-if-let-guard/bindings.rs b/src/test/ui/rfcs/rfc-2294-if-let-guard/bindings.rs similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/bindings.rs rename to src/test/ui/rfcs/rfc-2294-if-let-guard/bindings.rs diff --git a/src/test/ui/rfc-2294-if-let-guard/bindings.stderr b/src/test/ui/rfcs/rfc-2294-if-let-guard/bindings.stderr similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/bindings.stderr rename to src/test/ui/rfcs/rfc-2294-if-let-guard/bindings.stderr diff --git a/src/test/ui/rfc-2294-if-let-guard/feature-gate.rs b/src/test/ui/rfcs/rfc-2294-if-let-guard/feature-gate.rs similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/feature-gate.rs rename to src/test/ui/rfcs/rfc-2294-if-let-guard/feature-gate.rs diff --git a/src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr b/src/test/ui/rfcs/rfc-2294-if-let-guard/feature-gate.stderr similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/feature-gate.stderr rename to src/test/ui/rfcs/rfc-2294-if-let-guard/feature-gate.stderr diff --git a/src/test/ui/rfc-2294-if-let-guard/run-pass.rs b/src/test/ui/rfcs/rfc-2294-if-let-guard/run-pass.rs similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/run-pass.rs rename to src/test/ui/rfcs/rfc-2294-if-let-guard/run-pass.rs diff --git a/src/test/ui/rfc-2294-if-let-guard/typeck.rs b/src/test/ui/rfcs/rfc-2294-if-let-guard/typeck.rs similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/typeck.rs rename to src/test/ui/rfcs/rfc-2294-if-let-guard/typeck.rs diff --git a/src/test/ui/rfc-2294-if-let-guard/typeck.stderr b/src/test/ui/rfcs/rfc-2294-if-let-guard/typeck.stderr similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/typeck.stderr rename to src/test/ui/rfcs/rfc-2294-if-let-guard/typeck.stderr diff --git a/src/test/ui/rfc-2294-if-let-guard/warns.rs b/src/test/ui/rfcs/rfc-2294-if-let-guard/warns.rs similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/warns.rs rename to src/test/ui/rfcs/rfc-2294-if-let-guard/warns.rs diff --git a/src/test/ui/rfc-2294-if-let-guard/warns.stderr b/src/test/ui/rfcs/rfc-2294-if-let-guard/warns.stderr similarity index 100% rename from src/test/ui/rfc-2294-if-let-guard/warns.stderr rename to src/test/ui/rfcs/rfc-2294-if-let-guard/warns.stderr diff --git a/src/test/ui/rfc-2306/convert-id-const-with-gate.rs b/src/test/ui/rfcs/rfc-2306/convert-id-const-with-gate.rs similarity index 100% rename from src/test/ui/rfc-2306/convert-id-const-with-gate.rs rename to src/test/ui/rfcs/rfc-2306/convert-id-const-with-gate.rs diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr b/src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr similarity index 100% rename from src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr rename to src/test/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr diff --git a/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs b/src/test/ui/rfcs/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs similarity index 100% rename from src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs rename to src/test/ui/rfcs/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs b/src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-1.rs similarity index 100% rename from src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs rename to src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-1.rs diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr b/src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-1.stderr similarity index 100% rename from src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr rename to src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-1.stderr diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs b/src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-2.rs similarity index 100% rename from src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs rename to src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-2.rs diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr b/src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-2.stderr similarity index 100% rename from src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr rename to src/test/ui/rfcs/rfc-2457/crate_name_nonascii_forbidden-2.stderr diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs b/src/test/ui/rfcs/rfc-2457/extern_block_nonascii_forbidden.rs similarity index 100% rename from src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs rename to src/test/ui/rfcs/rfc-2457/extern_block_nonascii_forbidden.rs diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr b/src/test/ui/rfcs/rfc-2457/extern_block_nonascii_forbidden.stderr similarity index 100% rename from src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr rename to src/test/ui/rfcs/rfc-2457/extern_block_nonascii_forbidden.stderr diff --git a/src/test/ui/rfc-2457/idents-normalized.rs b/src/test/ui/rfcs/rfc-2457/idents-normalized.rs similarity index 100% rename from src/test/ui/rfc-2457/idents-normalized.rs rename to src/test/ui/rfcs/rfc-2457/idents-normalized.rs diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs b/src/test/ui/rfcs/rfc-2457/mod_file_nonascii_forbidden.rs similarity index 100% rename from src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs rename to src/test/ui/rfcs/rfc-2457/mod_file_nonascii_forbidden.rs diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr b/src/test/ui/rfcs/rfc-2457/mod_file_nonascii_forbidden.stderr similarity index 100% rename from src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr rename to src/test/ui/rfcs/rfc-2457/mod_file_nonascii_forbidden.stderr diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs b/src/test/ui/rfcs/rfc-2457/mod_file_nonascii_with_path_allowed.rs similarity index 100% rename from src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs rename to src/test/ui/rfcs/rfc-2457/mod_file_nonascii_with_path_allowed.rs diff --git a/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs b/src/test/ui/rfcs/rfc-2457/mod_inline_nonascii_allowed.rs similarity index 100% rename from src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs rename to src/test/ui/rfcs/rfc-2457/mod_inline_nonascii_allowed.rs diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs b/src/test/ui/rfcs/rfc-2457/no_mangle_nonascii_forbidden.rs similarity index 100% rename from src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs rename to src/test/ui/rfcs/rfc-2457/no_mangle_nonascii_forbidden.rs diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr b/src/test/ui/rfcs/rfc-2457/no_mangle_nonascii_forbidden.stderr similarity index 100% rename from src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr rename to src/test/ui/rfcs/rfc-2457/no_mangle_nonascii_forbidden.stderr diff --git a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.rs b/src/test/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.rs similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.rs rename to src/test/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.rs diff --git a/src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout b/src/test/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.stdout similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout rename to src/test/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.stdout diff --git a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.rs b/src/test/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.rs similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/disallowed-positions.rs rename to src/test/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.rs diff --git a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr b/src/test/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.stderr similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr rename to src/test/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.stderr diff --git a/src/test/ui/rfc-2497-if-let-chains/feature-gate.rs b/src/test/ui/rfcs/rfc-2497-if-let-chains/feature-gate.rs similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/feature-gate.rs rename to src/test/ui/rfcs/rfc-2497-if-let-chains/feature-gate.rs diff --git a/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr b/src/test/ui/rfcs/rfc-2497-if-let-chains/feature-gate.stderr similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr rename to src/test/ui/rfcs/rfc-2497-if-let-chains/feature-gate.stderr diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs b/src/test/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.rs similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/protect-precedences.rs rename to src/test/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.rs diff --git a/src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr b/src/test/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.stderr similarity index 100% rename from src/test/ui/rfc-2497-if-let-chains/protect-precedences.stderr rename to src/test/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.stderr diff --git a/src/test/ui/rfc-2565-param-attrs/attr-without-param.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/attr-without-param.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/attr-without-param.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/attr-without-param.rs diff --git a/src/test/ui/rfc-2565-param-attrs/attr-without-param.stderr b/src/test/ui/rfcs/rfc-2565-param-attrs/attr-without-param.stderr similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/attr-without-param.stderr rename to src/test/ui/rfcs/rfc-2565-param-attrs/attr-without-param.stderr diff --git a/src/test/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs diff --git a/src/test/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs diff --git a/src/test/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.rs diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.stderr similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.stderr diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-allowed.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-allowed.rs diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.rs diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.stderr similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.stderr diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/param-attrs-pretty.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs b/src/test/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs rename to src/test/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs diff --git a/src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr b/src/test/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr similarity index 100% rename from src/test/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr rename to src/test/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.rs similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.rs diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.stderr similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.stderr diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.rs similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.rs diff --git a/src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr b/src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.stderr similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr rename to src/test/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.stderr diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-msvc-only.rs b/src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-msvc-only.rs similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/raw-dylib-msvc-only.rs rename to src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-msvc-only.rs diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-msvc-only.stderr b/src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-msvc-only.stderr similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/raw-dylib-msvc-only.stderr rename to src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-msvc-only.stderr diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs b/src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.rs similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs rename to src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.rs diff --git a/src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr b/src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr similarity index 100% rename from src/test/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr rename to src/test/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-opt-out.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-opt-out.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-opt-out.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-opt-out.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.gated.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-impl-trait.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-bounds.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/in-trait-object.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/opt-out-twice.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/syntax.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/syntax.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/syntax.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/syntax.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/with-maybe-sized.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bound-opt-out/without-question-mark.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/hir-const-check.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/hir-const-check.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/hir-const-check.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-opt-out-trait.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/impl-opt-out-trait.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/impl-opt-out-trait.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/impl-opt-out-trait.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/impl-opt-out-trait.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/impl-opt-out-trait.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/impl-opt-out-trait.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/impl-opt-out-trait.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/stability.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/stability.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/stability.rs diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.stderr b/src/test/ui/rfcs/rfc-2632-const-trait-impl/stability.stderr similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/stability.stderr rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/stability.stderr diff --git a/src/test/ui/rfc-2632-const-trait-impl/syntax.rs b/src/test/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs similarity index 100% rename from src/test/ui/rfc-2632-const-trait-impl/syntax.rs rename to src/test/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs