diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 01ef4abd3dca3..412c6e3120ab2 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
 const ISSUES_ENTRY_LIMIT: usize = 1898;
-const ROOT_ENTRY_LIMIT: usize = 891;
+const ROOT_ENTRY_LIMIT: usize = 871;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/rfc-2005-default-binding-mode/enum.rs b/tests/ui/rfc-2005-default-binding-mode/enum.rs
deleted file mode 100644
index 4e57769d6e24c..0000000000000
--- a/tests/ui/rfc-2005-default-binding-mode/enum.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-enum Wrapper {
-    Wrap(i32),
-}
-
-use Wrapper::Wrap;
-
-pub fn main() {
-    let Wrap(x) = &Wrap(3);
-    *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
-
-
-    if let Some(x) = &Some(3) {
-        *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
-    } else {
-        panic!();
-    }
-
-    while let Some(x) = &Some(3) {
-        *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
-        break;
-    }
-}
diff --git a/tests/ui/rfc-2005-default-binding-mode/for.rs b/tests/ui/rfc-2005-default-binding-mode/for.rs
deleted file mode 100644
index d6c5a13b1bdb0..0000000000000
--- a/tests/ui/rfc-2005-default-binding-mode/for.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-struct Foo {}
-
-pub fn main() {
-    let mut tups = vec![(Foo {}, Foo {})];
-    // The below desugars to &(ref n, mut m).
-    for (n, mut m) in &tups {
-        //~^ ERROR cannot move out of a shared reference
-    }
-}
diff --git a/tests/ui/rfc-2005-default-binding-mode/lit.rs b/tests/ui/rfc-2005-default-binding-mode/lit.rs
deleted file mode 100644
index ce79cfbdc1a30..0000000000000
--- a/tests/ui/rfc-2005-default-binding-mode/lit.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// FIXME(tschottdorf): we want these to compile, but they don't.
-
-fn with_str() {
-    let s: &'static str = "abc";
-
-    match &s {
-            "abc" => true, //~ ERROR mismatched types
-            _ => panic!(),
-    };
-}
-
-fn with_bytes() {
-    let s: &'static [u8] = b"abc";
-
-    match &s {
-        b"abc" => true, //~ ERROR mismatched types
-        _ => panic!(),
-    };
-}
-
-pub fn main() {
-    with_str();
-    with_bytes();
-}
diff --git a/tests/ui/rfc-2005-default-binding-mode/slice.rs b/tests/ui/rfc-2005-default-binding-mode/slice.rs
deleted file mode 100644
index 363a0e3e649d9..0000000000000
--- a/tests/ui/rfc-2005-default-binding-mode/slice.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub fn main() {
-    let sl: &[u8] = b"foo";
-
-    match sl { //~ ERROR non-exhaustive patterns
-        [first, remainder @ ..] => {},
-    };
-}
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/bind-by-move-no-guards.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/former-E0008-now-pass.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-basic-examples.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-across-arms.stderr
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.rs
diff --git a/tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr b/tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
similarity index 100%
rename from tests/ui/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
rename to tests/ui/rfcs/rfc-0107-bind-by-move-pattern-guards/rfc-reject-double-move-in-first-arm.stderr
diff --git a/tests/ui/rfcs/rfc-1014-2.rs b/tests/ui/rfcs/rfc-1014-stdout-existential-crisis/rfc-1014-2.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-1014-2.rs
rename to tests/ui/rfcs/rfc-1014-stdout-existential-crisis/rfc-1014-2.rs
diff --git a/tests/ui/rfcs/rfc-1014.rs b/tests/ui/rfcs/rfc-1014-stdout-existential-crisis/rfc-1014.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-1014.rs
rename to tests/ui/rfcs/rfc-1014-stdout-existential-crisis/rfc-1014.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-embedded.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-direct-unsafe-ptr-param.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-embedded.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-hide-behind-indirect-unsafe-ptr-param.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/allow-use-behind-cousin-variant.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-embedded.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-direct-struct-param.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-embedded.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-doubly-indirect-param.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-embedded.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/cant-hide-behind-indirect-struct-param.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.no_gate.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/feature-gate.with_gate.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/fn-ptr-is-structurally-matchable.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-61188-match-slice-forbidden-without-eq.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-62307-match-ref-ref-forbidden-without-eq.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-63479-match-fnptr.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-empty-array-allowed-without-eq-issue-62336.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-forbidden-without-eq.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-nonempty-array-forbidden-without-eq.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.rs
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/match-requires-both-partialeq-and-eq.stderr
diff --git a/tests/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
similarity index 100%
rename from tests/ui/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/phantom-data-is-structurally-matchable.rs
diff --git a/tests/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/rfc1445/eq-allows-match-on-ty-in-macro.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/rfc1445/eq-allows-match-on-ty-in-macro.rs
diff --git a/tests/ui/rfcs/rfc1445/eq-allows-match.rs b/tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/rfc1445/eq-allows-match.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1445/eq-allows-match.rs
rename to tests/ui/rfcs/rfc-1445-restrict-constants-in-patterns/rfc1445/eq-allows-match.rs
diff --git a/tests/ui/rfcs/rfc1623-2.rs b/tests/ui/rfcs/rfc-1623-static/rfc1623-2.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1623-2.rs
rename to tests/ui/rfcs/rfc-1623-static/rfc1623-2.rs
diff --git a/tests/ui/rfcs/rfc1623-2.stderr b/tests/ui/rfcs/rfc-1623-static/rfc1623-2.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc1623-2.stderr
rename to tests/ui/rfcs/rfc-1623-static/rfc1623-2.stderr
diff --git a/tests/ui/rfcs/rfc1623-3.rs b/tests/ui/rfcs/rfc-1623-static/rfc1623-3.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1623-3.rs
rename to tests/ui/rfcs/rfc-1623-static/rfc1623-3.rs
diff --git a/tests/ui/rfcs/rfc1623-3.stderr b/tests/ui/rfcs/rfc-1623-static/rfc1623-3.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc1623-3.stderr
rename to tests/ui/rfcs/rfc-1623-static/rfc1623-3.stderr
diff --git a/tests/ui/rfcs/rfc1623.rs b/tests/ui/rfcs/rfc-1623-static/rfc1623.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1623.rs
rename to tests/ui/rfcs/rfc-1623-static/rfc1623.rs
diff --git a/tests/ui/rfcs/rfc1717/library-override.rs b/tests/ui/rfcs/rfc-1717-dllimport/1717-dllimport/library-override.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1717/library-override.rs
rename to tests/ui/rfcs/rfc-1717-dllimport/1717-dllimport/library-override.rs
diff --git a/tests/ui/rfc-1717-dllimport/missing-link-attr.rs b/tests/ui/rfcs/rfc-1717-dllimport/missing-link-attr.rs
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/missing-link-attr.rs
rename to tests/ui/rfcs/rfc-1717-dllimport/missing-link-attr.rs
diff --git a/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr b/tests/ui/rfcs/rfc-1717-dllimport/missing-link-attr.stderr
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
rename to tests/ui/rfcs/rfc-1717-dllimport/missing-link-attr.stderr
diff --git a/tests/ui/rfc-1717-dllimport/multiple-renames.rs b/tests/ui/rfcs/rfc-1717-dllimport/multiple-renames.rs
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/multiple-renames.rs
rename to tests/ui/rfcs/rfc-1717-dllimport/multiple-renames.rs
diff --git a/tests/ui/rfc-1717-dllimport/multiple-renames.stderr b/tests/ui/rfcs/rfc-1717-dllimport/multiple-renames.stderr
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/multiple-renames.stderr
rename to tests/ui/rfcs/rfc-1717-dllimport/multiple-renames.stderr
diff --git a/tests/ui/rfc-1717-dllimport/rename-modifiers.rs b/tests/ui/rfcs/rfc-1717-dllimport/rename-modifiers.rs
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/rename-modifiers.rs
rename to tests/ui/rfcs/rfc-1717-dllimport/rename-modifiers.rs
diff --git a/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr b/tests/ui/rfcs/rfc-1717-dllimport/rename-modifiers.stderr
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
rename to tests/ui/rfcs/rfc-1717-dllimport/rename-modifiers.stderr
diff --git a/tests/ui/rfc-1717-dllimport/rename-to-empty.rs b/tests/ui/rfcs/rfc-1717-dllimport/rename-to-empty.rs
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/rename-to-empty.rs
rename to tests/ui/rfcs/rfc-1717-dllimport/rename-to-empty.rs
diff --git a/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr b/tests/ui/rfcs/rfc-1717-dllimport/rename-to-empty.stderr
similarity index 100%
rename from tests/ui/rfc-1717-dllimport/rename-to-empty.stderr
rename to tests/ui/rfcs/rfc-1717-dllimport/rename-to-empty.stderr
diff --git a/tests/ui/rfcs/rfc1857-drop-order.rs b/tests/ui/rfcs/rfc-1857-stabilize-drop-order/drop-order.rs
similarity index 100%
rename from tests/ui/rfcs/rfc1857-drop-order.rs
rename to tests/ui/rfcs/rfc-1857-stabilize-drop-order/drop-order.rs
diff --git a/tests/ui/rfc-1937-termination-trait/issue-103052-1.rs b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/issue-103052-1.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.rs
diff --git a/tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-1.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/issue-103052-2.current.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/issue-103052-2.current.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.current.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/issue-103052-2.next.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/issue-103052-2.next.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.next.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/issue-103052-2.rs b/tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/issue-103052-2.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/issue-103052-2.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-err.rs
diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-ok.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error-ok.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-never.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-err.rs
diff --git a/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-ok.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str-ok.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-i32.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
diff --git a/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
similarity index 100%
rename from tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
rename to tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
diff --git a/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
diff --git a/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
diff --git a/tests/ui/rfc-2005-default-binding-mode/const.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/const.rs
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/const.rs
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/const.rs
diff --git a/tests/ui/rfc-2005-default-binding-mode/const.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/const.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/const.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/const.stderr
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/enum-ok.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum-ok.rs
new file mode 100644
index 0000000000000..52fbb90ed541b
--- /dev/null
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum-ok.rs
@@ -0,0 +1,45 @@
+// run-pass
+enum Wrapper {
+    Wrap(i32),
+}
+
+use Wrapper::Wrap;
+
+pub fn main() {
+    let Wrap(x) = &Wrap(3);
+    println!("{}", *x);
+
+    let Wrap(x) = &mut Wrap(3);
+    println!("{}", *x);
+
+    if let Some(x) = &Some(3) {
+        println!("{}", *x);
+    } else {
+        panic!();
+    }
+
+    if let Some(x) = &mut Some(3) {
+        println!("{}", *x);
+    } else {
+        panic!();
+    }
+
+    if let Some(x) = &mut Some(3) {
+        *x += 1;
+    } else {
+        panic!();
+    }
+
+    while let Some(x) = &Some(3) {
+        println!("{}", *x);
+        break;
+    }
+    while let Some(x) = &mut Some(3) {
+        println!("{}", *x);
+        break;
+    }
+    while let Some(x) = &mut Some(3) {
+        *x += 1;
+        break;
+    }
+}
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
index 52fbb90ed541b..4e57769d6e24c 100644
--- a/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
@@ -1,4 +1,3 @@
-// run-pass
 enum Wrapper {
     Wrap(i32),
 }
@@ -7,39 +6,17 @@ use Wrapper::Wrap;
 
 pub fn main() {
     let Wrap(x) = &Wrap(3);
-    println!("{}", *x);
+    *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
 
-    let Wrap(x) = &mut Wrap(3);
-    println!("{}", *x);
 
     if let Some(x) = &Some(3) {
-        println!("{}", *x);
-    } else {
-        panic!();
-    }
-
-    if let Some(x) = &mut Some(3) {
-        println!("{}", *x);
-    } else {
-        panic!();
-    }
-
-    if let Some(x) = &mut Some(3) {
-        *x += 1;
+        *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
     } else {
         panic!();
     }
 
     while let Some(x) = &Some(3) {
-        println!("{}", *x);
-        break;
-    }
-    while let Some(x) = &mut Some(3) {
-        println!("{}", *x);
-        break;
-    }
-    while let Some(x) = &mut Some(3) {
-        *x += 1;
+        *x += 1; //~ ERROR cannot assign to `*x`, which is behind a `&` reference
         break;
     }
 }
diff --git a/tests/ui/rfc-2005-default-binding-mode/enum.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/enum.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/enum.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/enum.stderr
diff --git a/tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.rs
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.rs
diff --git a/tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/explicit-mut.stderr
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/for-ok.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/for-ok.rs
new file mode 100644
index 0000000000000..a5a24a806340f
--- /dev/null
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/for-ok.rs
@@ -0,0 +1,20 @@
+// run-pass
+pub fn main() {
+    let mut tups = vec![(0u8, 1u8)];
+
+    for (n, m) in &tups {
+        let _: &u8 = n;
+        let _: &u8 = m;
+    }
+
+    for (n, m) in &mut tups {
+        *n += 1;
+        *m += 2;
+    }
+
+    assert_eq!(tups, vec![(1u8, 3u8)]);
+
+    for (n, m) in tups {
+        println!("{} {}", m, n);
+    }
+}
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs
index a5a24a806340f..d6c5a13b1bdb0 100644
--- a/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/for.rs
@@ -1,20 +1,9 @@
-// run-pass
-pub fn main() {
-    let mut tups = vec![(0u8, 1u8)];
-
-    for (n, m) in &tups {
-        let _: &u8 = n;
-        let _: &u8 = m;
-    }
+struct Foo {}
 
-    for (n, m) in &mut tups {
-        *n += 1;
-        *m += 2;
-    }
-
-    assert_eq!(tups, vec![(1u8, 3u8)]);
-
-    for (n, m) in tups {
-        println!("{} {}", m, n);
+pub fn main() {
+    let mut tups = vec![(Foo {}, Foo {})];
+    // The below desugars to &(ref n, mut m).
+    for (n, mut m) in &tups {
+        //~^ ERROR cannot move out of a shared reference
     }
 }
diff --git a/tests/ui/rfc-2005-default-binding-mode/for.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/for.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/for.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/for.stderr
diff --git a/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.rs
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.rs
diff --git a/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/issue-44912-or.stderr
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/lit-ok.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit-ok.rs
new file mode 100644
index 0000000000000..9379753598eb0
--- /dev/null
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit-ok.rs
@@ -0,0 +1,34 @@
+// run-pass
+#![allow(dead_code)]
+fn with_u8() {
+    let s = 5u8;
+    let r = match &s {
+        4 => false,
+        5 => true,
+        _ => false,
+    };
+    assert!(r);
+}
+
+// A string literal isn't mistaken for a non-ref pattern (in which case we'd
+// deref `s` and mess things up).
+fn with_str() {
+    let s: &'static str = "abc";
+    match s {
+            "abc" => true,
+            _ => panic!(),
+    };
+}
+
+// Ditto with byte strings.
+fn with_bytes() {
+    let s: &'static [u8] = b"abc";
+    match s {
+        b"abc" => true,
+        _ => panic!(),
+    };
+}
+
+pub fn main() {
+    with_str();
+}
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
index 9379753598eb0..ce79cfbdc1a30 100644
--- a/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
@@ -1,34 +1,24 @@
-// run-pass
-#![allow(dead_code)]
-fn with_u8() {
-    let s = 5u8;
-    let r = match &s {
-        4 => false,
-        5 => true,
-        _ => false,
-    };
-    assert!(r);
-}
+// FIXME(tschottdorf): we want these to compile, but they don't.
 
-// A string literal isn't mistaken for a non-ref pattern (in which case we'd
-// deref `s` and mess things up).
 fn with_str() {
     let s: &'static str = "abc";
-    match s {
-            "abc" => true,
+
+    match &s {
+            "abc" => true, //~ ERROR mismatched types
             _ => panic!(),
     };
 }
 
-// Ditto with byte strings.
 fn with_bytes() {
     let s: &'static [u8] = b"abc";
-    match s {
-        b"abc" => true,
+
+    match &s {
+        b"abc" => true, //~ ERROR mismatched types
         _ => panic!(),
     };
 }
 
 pub fn main() {
     with_str();
+    with_bytes();
 }
diff --git a/tests/ui/rfc-2005-default-binding-mode/lit.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/lit.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/lit.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/lit.stderr
diff --git a/tests/ui/rfc-2005-default-binding-mode/no-double-error.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.rs
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/no-double-error.rs
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.rs
diff --git a/tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/no-double-error.stderr
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/slice-ok.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice-ok.rs
new file mode 100644
index 0000000000000..33229a205f4d8
--- /dev/null
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice-ok.rs
@@ -0,0 +1,25 @@
+// run-pass
+
+fn slice_pat() {
+    let sl: &[u8] = b"foo";
+
+    match sl {
+        [first, remainder @ ..] => {
+            let _: &u8 = first;
+            assert_eq!(first, &b'f');
+            assert_eq!(remainder, b"oo");
+        }
+        [] => panic!(),
+    }
+}
+
+fn slice_pat_omission() {
+     match &[0, 1, 2] {
+        [..] => {}
+     };
+}
+
+fn main() {
+    slice_pat();
+    slice_pat_omission();
+}
diff --git a/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
index 33229a205f4d8..363a0e3e649d9 100644
--- a/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
+++ b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
@@ -1,25 +1,7 @@
-// run-pass
-
-fn slice_pat() {
+pub fn main() {
     let sl: &[u8] = b"foo";
 
-    match sl {
-        [first, remainder @ ..] => {
-            let _: &u8 = first;
-            assert_eq!(first, &b'f');
-            assert_eq!(remainder, b"oo");
-        }
-        [] => panic!(),
-    }
-}
-
-fn slice_pat_omission() {
-     match &[0, 1, 2] {
-        [..] => {}
-     };
-}
-
-fn main() {
-    slice_pat();
-    slice_pat_omission();
+    match sl { //~ ERROR non-exhaustive patterns
+        [first, remainder @ ..] => {},
+    };
 }
diff --git a/tests/ui/rfc-2005-default-binding-mode/slice.stderr b/tests/ui/rfcs/rfc-2005-default-binding-mode/slice.stderr
similarity index 100%
rename from tests/ui/rfc-2005-default-binding-mode/slice.stderr
rename to tests/ui/rfcs/rfc-2005-default-binding-mode/slice.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/monovariants.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/unstable.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/auxiliary/unstable.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/unstable.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-exhaustive.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/borrowck-non-exhaustive.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum-as-cast.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum-as-cast.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum-as-cast.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum-as-cast.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum-as-cast.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum-as-cast.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/enum_same_crate_empty_match.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/same_crate_proper.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/invalid-attribute.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/omitted-patterns.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/omitted-patterns.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/omitted-patterns.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/omitted-patterns.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/stable-omitted-patterns.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/stable-omitted-patterns.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/struct.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/struct.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/struct.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/struct.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/struct.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/struct.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/struct.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/struct.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/structs_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/structs_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/variant.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/variant.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/variant.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/variant.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/variant.stderr b/tests/ui/rfcs/rfc-2008-non-exhaustive/variant.stderr
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/variant.stderr
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/variant.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/variants_fictive_visibility.rs
diff --git a/tests/ui/rfc-2008-non-exhaustive/variants_same_crate.rs b/tests/ui/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs
similarity index 100%
rename from tests/ui/rfc-2008-non-exhaustive/variants_same_crate.rs
rename to tests/ui/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs
diff --git a/tests/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs b/tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
similarity index 100%
rename from tests/ui/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
rename to tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/downcast-unsafe-trait-objects.rs
diff --git a/tests/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs b/tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
similarity index 100%
rename from tests/ui/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
rename to tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/manual-self-impl-for-unsafe-obj.rs
diff --git a/tests/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs b/tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
similarity index 100%
rename from tests/ui/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
rename to tests/ui/rfcs/rfc-2027-object-safe-for-dispatch/static-dispatch-unsafe-object.rs
diff --git a/tests/ui/rfc-2091-track-caller/call-chain.rs b/tests/ui/rfcs/rfc-2091-track-caller/call-chain.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/call-chain.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/call-chain.rs
diff --git a/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs b/tests/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
diff --git a/tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr b/tests/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
diff --git a/tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs b/tests/ui/rfcs/rfc-2091-track-caller/caller-location-intrinsic.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/caller-location-intrinsic.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/caller-location-intrinsic.rs
diff --git a/tests/ui/rfc-2091-track-caller/const-caller-location.rs b/tests/ui/rfcs/rfc-2091-track-caller/const-caller-location.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/const-caller-location.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/const-caller-location.rs
diff --git a/tests/ui/rfc-2091-track-caller/diverging-caller-location.rs b/tests/ui/rfcs/rfc-2091-track-caller/diverging-caller-location.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/diverging-caller-location.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/diverging-caller-location.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-odd-syntax.rs b/tests/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-odd-syntax.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr b/tests/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-odd-syntax.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/error-odd-syntax.stderr
diff --git a/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs b/tests/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-invalid-abi.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr b/tests/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-invalid-abi.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-invalid-abi.stderr
diff --git a/tests/ui/rfc-2091-track-caller/error-with-main.rs b/tests/ui/rfcs/rfc-2091-track-caller/error-with-main.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-main.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-main.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-with-main.stderr b/tests/ui/rfcs/rfc-2091-track-caller/error-with-main.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-main.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-main.stderr
diff --git a/tests/ui/rfc-2091-track-caller/error-with-naked.rs b/tests/ui/rfcs/rfc-2091-track-caller/error-with-naked.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-naked.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-naked.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-with-naked.stderr b/tests/ui/rfcs/rfc-2091-track-caller/error-with-naked.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-naked.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-naked.stderr
diff --git a/tests/ui/rfc-2091-track-caller/error-with-start.rs b/tests/ui/rfcs/rfc-2091-track-caller/error-with-start.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-start.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-start.rs
diff --git a/tests/ui/rfc-2091-track-caller/error-with-start.stderr b/tests/ui/rfcs/rfc-2091-track-caller/error-with-start.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/error-with-start.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/error-with-start.stderr
diff --git a/tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs b/tests/ui/rfcs/rfc-2091-track-caller/intrinsic-wrapper.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/intrinsic-wrapper.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/intrinsic-wrapper.rs
diff --git a/tests/ui/rfc-2091-track-caller/macro-declaration.rs b/tests/ui/rfcs/rfc-2091-track-caller/macro-declaration.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/macro-declaration.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/macro-declaration.rs
diff --git a/tests/ui/rfc-2091-track-caller/mir-inlined-macro.rs b/tests/ui/rfcs/rfc-2091-track-caller/mir-inlined-macro.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/mir-inlined-macro.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/mir-inlined-macro.rs
diff --git a/tests/ui/rfc-2091-track-caller/only-for-fns.rs b/tests/ui/rfcs/rfc-2091-track-caller/only-for-fns.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/only-for-fns.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/only-for-fns.rs
diff --git a/tests/ui/rfc-2091-track-caller/only-for-fns.stderr b/tests/ui/rfcs/rfc-2091-track-caller/only-for-fns.stderr
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/only-for-fns.stderr
rename to tests/ui/rfcs/rfc-2091-track-caller/only-for-fns.stderr
diff --git a/tests/ui/rfc-2091-track-caller/pass.rs b/tests/ui/rfcs/rfc-2091-track-caller/pass.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/pass.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/pass.rs
diff --git a/tests/ui/rfc-2091-track-caller/std-panic-locations.rs b/tests/ui/rfcs/rfc-2091-track-caller/std-panic-locations.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/std-panic-locations.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/std-panic-locations.rs
diff --git a/tests/ui/rfc-2091-track-caller/track-caller-attribute.rs b/tests/ui/rfcs/rfc-2091-track-caller/track-caller-attribute.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/track-caller-attribute.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/track-caller-attribute.rs
diff --git a/tests/ui/rfc-2091-track-caller/track-caller-ffi.rs b/tests/ui/rfcs/rfc-2091-track-caller/track-caller-ffi.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/track-caller-ffi.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/track-caller-ffi.rs
diff --git a/tests/ui/rfc-2091-track-caller/tracked-closure.rs b/tests/ui/rfcs/rfc-2091-track-caller/tracked-closure.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/tracked-closure.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/tracked-closure.rs
diff --git a/tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs b/tests/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr-with-arg.rs
diff --git a/tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs b/tests/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/tracked-fn-ptr.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/tracked-fn-ptr.rs
diff --git a/tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs b/tests/ui/rfcs/rfc-2091-track-caller/tracked-trait-impls.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/tracked-trait-impls.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/tracked-trait-impls.rs
diff --git a/tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs b/tests/ui/rfcs/rfc-2091-track-caller/tracked-trait-obj.rs
similarity index 100%
rename from tests/ui/rfc-2091-track-caller/tracked-trait-obj.rs
rename to tests/ui/rfcs/rfc-2091-track-caller/tracked-trait-obj.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/cross-crate.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/cross-crate.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/cross-crate.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/cross-crate.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/cross-crate.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/cross-crate.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/cross-crate.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/cross-crate.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/dont-infer-static.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/dont-infer-static.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/dont-infer-static.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/dont-infer-static.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/enum.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/enum.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/enum.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/enum.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/enum.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/enum.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/enum.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/enum.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-dyn.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-dyn.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-dyn.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-dyn.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-dyn.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-enum.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-enum.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-enum.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-enum.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-enum.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-projection.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-projection.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-projection.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-projection.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-projection.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-struct.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-struct.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-struct.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-struct.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-struct.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-union.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-union.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-union.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-union.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/explicit-union.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/explicit-union.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/explicit-union.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/explicit-union.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/issue-54467.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/issue-54467.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/issue-54467.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/issue-54467.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-enum.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-enum.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-enum.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-enum.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-enum.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-enum.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-enum.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-enum.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-regions.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-regions.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-regions.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-regions.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-regions.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-regions.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-regions.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-regions.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-structs.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-structs.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-structs.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-structs.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-structs.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-structs.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-structs.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-structs.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-union.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-union.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-union.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-union.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/nested-union.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/nested-union.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/nested-union.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/nested-union.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/privacy.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/privacy.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/privacy.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/privacy.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/projection.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/projection.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/projection.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/projection.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/projection.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/projection.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/projection.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/projection.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/reference.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/reference.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/reference.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/reference.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/reference.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/reference.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/reference.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/reference.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region-rev.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-region.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type-rev.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-outlives-nominal-type-type.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/self-dyn.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/self-dyn.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/self-dyn.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/self-dyn.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/self-dyn.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/self-dyn.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/self-dyn.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/self-dyn.stderr
diff --git a/tests/ui/rfc-2093-infer-outlives/self-structs.rs b/tests/ui/rfcs/rfc-2093-infer-outlives/self-structs.rs
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/self-structs.rs
rename to tests/ui/rfcs/rfc-2093-infer-outlives/self-structs.rs
diff --git a/tests/ui/rfc-2093-infer-outlives/self-structs.stderr b/tests/ui/rfcs/rfc-2093-infer-outlives/self-structs.stderr
similarity index 100%
rename from tests/ui/rfc-2093-infer-outlives/self-structs.stderr
rename to tests/ui/rfcs/rfc-2093-infer-outlives/self-structs.stderr
diff --git a/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs b/tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.rs
similarity index 100%
rename from tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs
rename to tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.rs
diff --git a/tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr
similarity index 100%
rename from tests/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr
rename to tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr
diff --git a/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/tests/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
similarity index 100%
rename from tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
rename to tests/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.rs
diff --git a/tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/tests/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
similarity index 100%
rename from tests/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
rename to tests/ui/rfcs/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.stderr
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-1.stderr
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.stderr
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-2.stderr
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.stderr
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/non-existent-3.stderr
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/not-allowed.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.stderr
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/not-allowed.stderr
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/single-segment.rs b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.rs
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/single-segment.rs
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.rs
diff --git a/tests/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/tests/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.stderr
similarity index 100%
rename from tests/ui/rfc-2126-extern-absolute-paths/single-segment.stderr
rename to tests/ui/rfcs/rfc-2126-extern-absolute-paths/single-segment.stderr
diff --git a/tests/ui/rfc-2294-if-let-guard/bindings.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/bindings.rs
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/bindings.rs
rename to tests/ui/rfcs/rfc-2294-if-let-guard/bindings.rs
diff --git a/tests/ui/rfc-2294-if-let-guard/bindings.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/bindings.stderr
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/bindings.stderr
rename to tests/ui/rfcs/rfc-2294-if-let-guard/bindings.stderr
diff --git a/tests/ui/rfc-2294-if-let-guard/feature-gate.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/feature-gate.rs
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/feature-gate.rs
rename to tests/ui/rfcs/rfc-2294-if-let-guard/feature-gate.rs
diff --git a/tests/ui/rfc-2294-if-let-guard/feature-gate.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/feature-gate.stderr
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/feature-gate.stderr
rename to tests/ui/rfcs/rfc-2294-if-let-guard/feature-gate.stderr
diff --git a/tests/ui/rfc-2294-if-let-guard/run-pass.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/run-pass.rs
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/run-pass.rs
rename to tests/ui/rfcs/rfc-2294-if-let-guard/run-pass.rs
diff --git a/tests/ui/rfc-2294-if-let-guard/typeck.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/typeck.rs
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/typeck.rs
rename to tests/ui/rfcs/rfc-2294-if-let-guard/typeck.rs
diff --git a/tests/ui/rfc-2294-if-let-guard/typeck.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/typeck.stderr
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/typeck.stderr
rename to tests/ui/rfcs/rfc-2294-if-let-guard/typeck.stderr
diff --git a/tests/ui/rfc-2294-if-let-guard/warns.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/warns.rs
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/warns.rs
rename to tests/ui/rfcs/rfc-2294-if-let-guard/warns.rs
diff --git a/tests/ui/rfc-2294-if-let-guard/warns.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/warns.stderr
similarity index 100%
rename from tests/ui/rfc-2294-if-let-guard/warns.stderr
rename to tests/ui/rfcs/rfc-2294-if-let-guard/warns.stderr
diff --git a/tests/ui/rfcs/rfc-2302-self-struct-ctor.rs b/tests/ui/rfcs/rfc-2302-self-struct-ctor/rfc-2302-self-struct-ctor.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2302-self-struct-ctor.rs
rename to tests/ui/rfcs/rfc-2302-self-struct-ctor/rfc-2302-self-struct-ctor.rs
diff --git a/tests/ui/rfc-2306/convert-id-const-with-gate.rs b/tests/ui/rfcs/rfc-2306-convert-id/convert-id-const-with-gate.rs
similarity index 100%
rename from tests/ui/rfc-2306/convert-id-const-with-gate.rs
rename to tests/ui/rfcs/rfc-2306-convert-id/convert-id-const-with-gate.rs
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-expected-behavior.run.stderr
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.rs
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.rs
diff --git a/tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr b/tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
similarity index 100%
rename from tests/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
rename to tests/ui/rfcs/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
diff --git a/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs b/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.rs
diff --git a/tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr b/tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/feature-gate-do_not_recommend.stderr
diff --git a/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.rs b/tests/ui/rfcs/rfc-2397-do-not-recommend/incorrect-locations.rs
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/incorrect-locations.rs
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/incorrect-locations.rs
diff --git a/tests/ui/rfc-2397-do-not-recommend/incorrect-locations.stderr b/tests/ui/rfcs/rfc-2397-do-not-recommend/incorrect-locations.stderr
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/incorrect-locations.stderr
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/incorrect-locations.stderr
diff --git a/tests/ui/rfc-2397-do-not-recommend/unstable-feature.rs b/tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.rs
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/unstable-feature.rs
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.rs
diff --git a/tests/ui/rfc-2397-do-not-recommend/unstable-feature.stderr b/tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr
similarity index 100%
rename from tests/ui/rfc-2397-do-not-recommend/unstable-feature.stderr
rename to tests/ui/rfcs/rfc-2397-do-not-recommend/unstable-feature.stderr
diff --git a/tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof/offsetof-alignof-sizeof-pure-can-be-used-as-idents.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
rename to tests/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof/offsetof-alignof-sizeof-pure-can-be-used-as-idents.rs
diff --git a/tests/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
similarity index 100%
rename from tests/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
diff --git a/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.rs
similarity index 100%
rename from tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.rs
diff --git a/tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr b/tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.stderr
similarity index 100%
rename from tests/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.stderr
diff --git a/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.rs
similarity index 100%
rename from tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.rs
diff --git a/tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr b/tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.stderr
similarity index 100%
rename from tests/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.stderr
diff --git a/tests/ui/rfc-2457/extern_block_nonascii_forbidden.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/extern_block_nonascii_forbidden.rs
similarity index 100%
rename from tests/ui/rfc-2457/extern_block_nonascii_forbidden.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/extern_block_nonascii_forbidden.rs
diff --git a/tests/ui/rfc-2457/extern_block_nonascii_forbidden.stderr b/tests/ui/rfcs/rfc-2457-non-ascii-idents/extern_block_nonascii_forbidden.stderr
similarity index 100%
rename from tests/ui/rfc-2457/extern_block_nonascii_forbidden.stderr
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/extern_block_nonascii_forbidden.stderr
diff --git a/tests/ui/rfc-2457/idents-normalized.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/idents-normalized.rs
similarity index 100%
rename from tests/ui/rfc-2457/idents-normalized.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/idents-normalized.rs
diff --git a/tests/ui/rfc-2457/mod_file_nonascii_forbidden.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_forbidden.rs
similarity index 100%
rename from tests/ui/rfc-2457/mod_file_nonascii_forbidden.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_forbidden.rs
diff --git a/tests/ui/rfc-2457/mod_file_nonascii_forbidden.stderr b/tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_forbidden.stderr
similarity index 100%
rename from tests/ui/rfc-2457/mod_file_nonascii_forbidden.stderr
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_forbidden.stderr
diff --git a/tests/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_with_path_allowed.rs
similarity index 100%
rename from tests/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_file_nonascii_with_path_allowed.rs
diff --git a/tests/ui/rfc-2457/mod_inline_nonascii_allowed.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_inline_nonascii_allowed.rs
similarity index 100%
rename from tests/ui/rfc-2457/mod_inline_nonascii_allowed.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/mod_inline_nonascii_allowed.rs
diff --git a/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.rs b/tests/ui/rfcs/rfc-2457-non-ascii-idents/no_mangle_nonascii_forbidden.rs
similarity index 100%
rename from tests/ui/rfc-2457/no_mangle_nonascii_forbidden.rs
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/no_mangle_nonascii_forbidden.rs
diff --git a/tests/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr b/tests/ui/rfcs/rfc-2457-non-ascii-idents/no_mangle_nonascii_forbidden.stderr
similarity index 100%
rename from tests/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr
rename to tests/ui/rfcs/rfc-2457-non-ascii-idents/no_mangle_nonascii_forbidden.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ast-pretty-check.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout b/tests/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.stdout
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ast-pretty-check.stdout
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ast-pretty-check.stdout
diff --git a/tests/ui/rfc-2497-if-let-chains/ast-validate-guards.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/ast-validate-guards.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ast-validate-guards.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ast-validate-guards.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/ast-validate-guards.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/ast-validate-guards.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ast-validate-guards.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ast-validate-guards.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/chains-without-let.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/chains-without-let.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/chains-without-let.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/chains-without-let.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/chains-without-let.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/chains-without-let.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/chains-without-let.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/chains-without-let.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/disallowed-positions.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/disallowed-positions.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/disallowed-positions.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/feature-gate.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/feature-gate.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/feature-gate.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/feature-gate.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/feature-gate.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/feature-gate.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/feature-gate.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/feature-gate.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/irrefutable-lets.disallowed.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/irrefutable-lets.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/irrefutable-lets.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/irrefutable-lets.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/irrefutable-lets.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-88498.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-88498.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-88498.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-88498.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-90722.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-90722.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-90722.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-90722.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-92145.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-92145.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-92145.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-92145.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-93150.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-93150.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-93150.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-93150.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-93150.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-93150.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-93150.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-93150.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/issue-99938.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/issue-99938.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/issue-99938.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/issue-99938.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/no-double-assigments.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/no-double-assigments.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/no-double-assigments.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/no-double-assigments.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/protect-precedences.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/protect-precedences.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.rs
diff --git a/tests/ui/rfc-2497-if-let-chains/protect-precedences.stderr b/tests/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.stderr
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/protect-precedences.stderr
rename to tests/ui/rfcs/rfc-2497-if-let-chains/protect-precedences.stderr
diff --git a/tests/ui/rfc-2497-if-let-chains/then-else-blocks.rs b/tests/ui/rfcs/rfc-2497-if-let-chains/then-else-blocks.rs
similarity index 100%
rename from tests/ui/rfc-2497-if-let-chains/then-else-blocks.rs
rename to tests/ui/rfcs/rfc-2497-if-let-chains/then-else-blocks.rs
diff --git a/tests/ui/rfc-2565-param-attrs/attr-without-param.rs b/tests/ui/rfcs/rfc-2565-param-attrs/attr-without-param.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/attr-without-param.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/attr-without-param.rs
diff --git a/tests/ui/rfc-2565-param-attrs/attr-without-param.stderr b/tests/ui/rfcs/rfc-2565-param-attrs/attr-without-param.stderr
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/attr-without-param.stderr
rename to tests/ui/rfcs/rfc-2565-param-attrs/attr-without-param.stderr
diff --git a/tests/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/auxiliary/ident-mac.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs
diff --git a/tests/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/auxiliary/param-attrs.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs
diff --git a/tests/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs b/tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-2018.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-2018.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.rs
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-2018.stderr b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.stderr
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-2018.stderr
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-allowed.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-allowed.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-allowed.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-allowed.rs
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-cfg.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.rs
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.stderr
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-cfg.stderr
diff --git a/tests/ui/rfc-2565-param-attrs/param-attrs-pretty.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/param-attrs-pretty.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs
diff --git a/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs b/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
rename to tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
diff --git a/tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr b/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
similarity index 100%
rename from tests/ui/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
rename to tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/dlltool-failed.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/dlltool-failed.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/dlltool-failed.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/dlltool-failed.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-invalid-format.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-multiple.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-multiple.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unsupported-link-kind.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-x86-only.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/invalid-dlltool.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/invalid-dlltool.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/invalid-dlltool.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/invalid-dlltool.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-and-name.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-invalid-format.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-missing-argument.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-missing-argument.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-multiple.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-multiple.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-multiple.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-not-foreign-fn.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-large.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-too-many-arguments.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/link-ordinal-unsupported-link-kind.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/multiple-declarations.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/multiple-declarations.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/multiple-declarations.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/raw-dylib-windows-only.stderr
diff --git a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs b/tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.rs
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/unsupported-abi.rs
rename to tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.rs
diff --git a/tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr b/tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.stderr
similarity index 100%
rename from tests/ui/rfc-2627-raw-dylib/unsupported-abi.stderr
rename to tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/assoc-type.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/assoc-type.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/assoc-type.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/attr-misuse.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/attr-misuse.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/attr-misuse.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/attr-misuse.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-in-impl.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-chain.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call-generic-method-pass.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/call.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/call.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/call.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/call.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-closure-trait-method.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-closures.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-closures.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-drop.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-drop.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-norecover.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-recovery.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-trait.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-trait.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const-impl-trait.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const-impl-trait.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/cross-crate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stock.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/do-not-const-check-override.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check-override.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/do-not-const-check-override.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check-override.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/do-not-const-check.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/do-not-const-check.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/feature-gate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/feature-gate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/gate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/gate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/gate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/gate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/gate.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/gate.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/gate.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/gate.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/generic-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/generic-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/generic-bound.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/generic-bound.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/hir-const-check.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/hir-const-check.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/hir-const-check.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/hir-const-check.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/inherent-impl.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/inherent-impl.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/inherent-impl.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-100222.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-100222.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-100222.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-100222.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-102156.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-102156.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-102156.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-102156.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-102985.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-102985.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-102985.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-102985.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-103677.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-103677.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-103677.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-103677.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-79450.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-79450.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-79450.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-79450.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-88155.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-88155.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-88155.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-88155.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-90052.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-90052.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-90052.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-90052.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-90052.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-90052.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-90052.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-90052.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-92111.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-92111.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/nested-closure.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/nested-closure.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/nested-closure.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/nested-closure.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/default-keyword.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specializing-constness-2.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/specializing-constness.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specializing-constness.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/specializing-constness.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/specializing-constness.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/staged-api.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/staged-api.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.stable.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/staged-api.stable.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.stable.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.unstable.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/staged-api.unstable.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.unstable.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/static-const-trait-bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/static-const-trait-bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/static-const-trait-bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/std-impl-gate.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits-fail.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits-fail.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/super-traits.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/super-traits.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/syntax.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/syntax.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-syntax.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-const-syntax.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-syntax.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-twice.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-twice.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde-twice.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde-twice.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/tilde_const_on_impl_bound.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-default-body-stability.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-run.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-run.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/trait-where-clause.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr
diff --git a/tests/ui/rfc-2632-const-trait-impl/without-tilde.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/without-tilde.rs
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/without-tilde.rs
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/without-tilde.rs
diff --git a/tests/ui/rfc-2632-const-trait-impl/without-tilde.stderr b/tests/ui/rfcs/rfc-2632-const-trait-impl/without-tilde.stderr
similarity index 100%
rename from tests/ui/rfc-2632-const-trait-impl/without-tilde.stderr
rename to tests/ui/rfcs/rfc-2632-const-trait-impl/without-tilde.stderr