diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 97c42752c12dd..94f8d23c1586a 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -3720,16 +3720,6 @@ ui/rfcs/rfc-2497-if-let-chains/issue-99938.rs
 ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs
 ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs
 ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-100222.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-102156.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-102985.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-103677.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-79450.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-88155.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-92111.rs
-ui/rfcs/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
-ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
-ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
 ui/rust-2018/issue-51008-1.rs
 ui/rust-2018/issue-51008.rs
 ui/rust-2018/issue-52202-use-suggestions.rs
@@ -3983,6 +3973,16 @@ ui/traits/alias/issue-75983.rs
 ui/traits/alias/issue-83613.rs
 ui/traits/associated_type_bound/issue-51446.rs
 ui/traits/auxiliary/issue_89119_intercrate_caching.rs
+ui/traits/const-traits/issue-100222.rs
+ui/traits/const-traits/issue-102156.rs
+ui/traits/const-traits/issue-102985.rs
+ui/traits/const-traits/issue-103677.rs
+ui/traits/const-traits/issue-79450.rs
+ui/traits/const-traits/issue-88155.rs
+ui/traits/const-traits/issue-92111.rs
+ui/traits/const-traits/issue-92230-wf-super-trait-env.rs
+ui/traits/const-traits/specialization/issue-95186-specialize-on-tilde-const.rs
+ui/traits/const-traits/specialization/issue-95187-same-trait-bound-different-constness.rs
 ui/traits/issue-103563.rs
 ui/traits/issue-104322.rs
 ui/traits/issue-105231.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-0.rs b/tests/ui/traits/const-traits/assoc-type-const-bound-usage-0.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-0.rs
rename to tests/ui/traits/const-traits/assoc-type-const-bound-usage-0.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-0.stderr b/tests/ui/traits/const-traits/assoc-type-const-bound-usage-0.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-0.stderr
rename to tests/ui/traits/const-traits/assoc-type-const-bound-usage-0.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-1.rs b/tests/ui/traits/const-traits/assoc-type-const-bound-usage-1.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-1.rs
rename to tests/ui/traits/const-traits/assoc-type-const-bound-usage-1.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-1.stderr b/tests/ui/traits/const-traits/assoc-type-const-bound-usage-1.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type-const-bound-usage-1.stderr
rename to tests/ui/traits/const-traits/assoc-type-const-bound-usage-1.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs b/tests/ui/traits/const-traits/assoc-type.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.rs
rename to tests/ui/traits/const-traits/assoc-type.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr b/tests/ui/traits/const-traits/assoc-type.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/assoc-type.stderr
rename to tests/ui/traits/const-traits/assoc-type.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.rs b/tests/ui/traits/const-traits/attr-misuse.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.rs
rename to tests/ui/traits/const-traits/attr-misuse.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.stderr b/tests/ui/traits/const-traits/attr-misuse.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/attr-misuse.stderr
rename to tests/ui/traits/const-traits/attr-misuse.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs b/tests/ui/traits/const-traits/auxiliary/cross-crate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/cross-crate.rs
rename to tests/ui/traits/const-traits/auxiliary/cross-crate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/staged-api.rs b/tests/ui/traits/const-traits/auxiliary/staged-api.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/auxiliary/staged-api.rs
rename to tests/ui/traits/const-traits/auxiliary/staged-api.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs b/tests/ui/traits/const-traits/call-const-trait-method-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
rename to tests/ui/traits/const-traits/call-const-trait-method-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr b/tests/ui/traits/const-traits/call-const-trait-method-fail.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
rename to tests/ui/traits/const-traits/call-const-trait-method-fail.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs b/tests/ui/traits/const-traits/call-const-trait-method-pass.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
rename to tests/ui/traits/const-traits/call-const-trait-method-pass.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr b/tests/ui/traits/const-traits/call-const-trait-method-pass.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-const-trait-method-pass.stderr
rename to tests/ui/traits/const-traits/call-const-trait-method-pass.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.rs b/tests/ui/traits/const-traits/call-generic-in-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.rs
rename to tests/ui/traits/const-traits/call-generic-in-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.stderr b/tests/ui/traits/const-traits/call-generic-in-impl.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-in-impl.stderr
rename to tests/ui/traits/const-traits/call-generic-in-impl.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs b/tests/ui/traits/const-traits/call-generic-method-chain.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.rs
rename to tests/ui/traits/const-traits/call-generic-method-chain.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.stderr b/tests/ui/traits/const-traits/call-generic-method-chain.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-chain.stderr
rename to tests/ui/traits/const-traits/call-generic-method-chain.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs b/tests/ui/traits/const-traits/call-generic-method-dup-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.rs
rename to tests/ui/traits/const-traits/call-generic-method-dup-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr b/tests/ui/traits/const-traits/call-generic-method-dup-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-dup-bound.stderr
rename to tests/ui/traits/const-traits/call-generic-method-dup-bound.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs b/tests/ui/traits/const-traits/call-generic-method-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-fail.rs
rename to tests/ui/traits/const-traits/call-generic-method-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs b/tests/ui/traits/const-traits/call-generic-method-nonconst-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst-bound.rs
rename to tests/ui/traits/const-traits/call-generic-method-nonconst-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs b/tests/ui/traits/const-traits/call-generic-method-nonconst.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
rename to tests/ui/traits/const-traits/call-generic-method-nonconst.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr b/tests/ui/traits/const-traits/call-generic-method-nonconst.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr
rename to tests/ui/traits/const-traits/call-generic-method-nonconst.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs b/tests/ui/traits/const-traits/call-generic-method-pass.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.rs
rename to tests/ui/traits/const-traits/call-generic-method-pass.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.stderr b/tests/ui/traits/const-traits/call-generic-method-pass.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call-generic-method-pass.stderr
rename to tests/ui/traits/const-traits/call-generic-method-pass.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/call.rs b/tests/ui/traits/const-traits/call.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/call.rs
rename to tests/ui/traits/const-traits/call.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs b/tests/ui/traits/const-traits/const-and-non-const-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
rename to tests/ui/traits/const-traits/const-and-non-const-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr b/tests/ui/traits/const-traits/const-and-non-const-impl.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
rename to tests/ui/traits/const-traits/const-and-non-const-impl.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.rs b/tests/ui/traits/const-traits/const-bound-on-not-const-associated-fn.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.rs
rename to tests/ui/traits/const-traits/const-bound-on-not-const-associated-fn.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.stderr b/tests/ui/traits/const-traits/const-bound-on-not-const-associated-fn.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-bound-on-not-const-associated-fn.stderr
rename to tests/ui/traits/const-traits/const-bound-on-not-const-associated-fn.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bounds-non-const-trait.rs b/tests/ui/traits/const-traits/const-bounds-non-const-trait.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-bounds-non-const-trait.rs
rename to tests/ui/traits/const-traits/const-bounds-non-const-trait.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-bounds-non-const-trait.stderr b/tests/ui/traits/const-traits/const-bounds-non-const-trait.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-bounds-non-const-trait.stderr
rename to tests/ui/traits/const-traits/const-bounds-non-const-trait.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs b/tests/ui/traits/const-traits/const-check-fns-in-const-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
rename to tests/ui/traits/const-traits/const-check-fns-in-const-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr b/tests/ui/traits/const-traits/const-check-fns-in-const-impl.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
rename to tests/ui/traits/const-traits/const-check-fns-in-const-impl.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs b/tests/ui/traits/const-traits/const-closure-parse-not-item.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs
rename to tests/ui/traits/const-traits/const-closure-parse-not-item.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.stderr b/tests/ui/traits/const-traits/const-closure-parse-not-item.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-parse-not-item.stderr
rename to tests/ui/traits/const-traits/const-closure-parse-not-item.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs b/tests/ui/traits/const-traits/const-closure-trait-method-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.rs
rename to tests/ui/traits/const-traits/const-closure-trait-method-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr b/tests/ui/traits/const-traits/const-closure-trait-method-fail.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method-fail.stderr
rename to tests/ui/traits/const-traits/const-closure-trait-method-fail.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.rs b/tests/ui/traits/const-traits/const-closure-trait-method.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.rs
rename to tests/ui/traits/const-traits/const-closure-trait-method.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.stderr b/tests/ui/traits/const-traits/const-closure-trait-method.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closure-trait-method.stderr
rename to tests/ui/traits/const-traits/const-closure-trait-method.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.rs b/tests/ui/traits/const-traits/const-closures.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.rs
rename to tests/ui/traits/const-traits/const-closures.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.stderr b/tests/ui/traits/const-traits/const-closures.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-closures.stderr
rename to tests/ui/traits/const-traits/const-closures.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.rs b/tests/ui/traits/const-traits/const-default-method-bodies.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.rs
rename to tests/ui/traits/const-traits/const-default-method-bodies.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.stderr b/tests/ui/traits/const-traits/const-default-method-bodies.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-default-method-bodies.stderr
rename to tests/ui/traits/const-traits/const-default-method-bodies.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.rs b/tests/ui/traits/const-traits/const-drop-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.rs
rename to tests/ui/traits/const-traits/const-drop-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.stderr b/tests/ui/traits/const-traits/const-drop-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-bound.stderr
rename to tests/ui/traits/const-traits/const-drop-bound.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr b/tests/ui/traits/const-traits/const-drop-fail-2.precise.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.precise.stderr
rename to tests/ui/traits/const-traits/const-drop-fail-2.precise.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.rs b/tests/ui/traits/const-traits/const-drop-fail-2.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.rs
rename to tests/ui/traits/const-traits/const-drop-fail-2.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stderr b/tests/ui/traits/const-traits/const-drop-fail-2.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stderr
rename to tests/ui/traits/const-traits/const-drop-fail-2.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr b/tests/ui/traits/const-traits/const-drop-fail-2.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail-2.stock.stderr
rename to tests/ui/traits/const-traits/const-drop-fail-2.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr b/tests/ui/traits/const-traits/const-drop-fail.precise.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.precise.stderr
rename to tests/ui/traits/const-traits/const-drop-fail.precise.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs b/tests/ui/traits/const-traits/const-drop-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.rs
rename to tests/ui/traits/const-traits/const-drop-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr b/tests/ui/traits/const-traits/const-drop-fail.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop-fail.stock.stderr
rename to tests/ui/traits/const-traits/const-drop-fail.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.precise.stderr b/tests/ui/traits/const-traits/const-drop.precise.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.precise.stderr
rename to tests/ui/traits/const-traits/const-drop.precise.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs b/tests/ui/traits/const-traits/const-drop.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.rs
rename to tests/ui/traits/const-traits/const-drop.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.stock.stderr b/tests/ui/traits/const-traits/const-drop.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-drop.stock.stderr
rename to tests/ui/traits/const-traits/const-drop.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-fns-are-early-bound.rs b/tests/ui/traits/const-traits/const-fns-are-early-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-fns-are-early-bound.rs
rename to tests/ui/traits/const-traits/const-fns-are-early-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-fns-are-early-bound.stderr b/tests/ui/traits/const-traits/const-fns-are-early-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-fns-are-early-bound.stderr
rename to tests/ui/traits/const-traits/const-fns-are-early-bound.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs b/tests/ui/traits/const-traits/const-impl-norecover.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.rs
rename to tests/ui/traits/const-traits/const-impl-norecover.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr b/tests/ui/traits/const-traits/const-impl-norecover.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-norecover.stderr
rename to tests/ui/traits/const-traits/const-impl-norecover.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs b/tests/ui/traits/const-traits/const-impl-recovery.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.rs
rename to tests/ui/traits/const-traits/const-impl-recovery.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr b/tests/ui/traits/const-traits/const-impl-recovery.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-recovery.stderr
rename to tests/ui/traits/const-traits/const-impl-recovery.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs b/tests/ui/traits/const-traits/const-impl-requires-const-trait.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.rs
rename to tests/ui/traits/const-traits/const-impl-requires-const-trait.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr b/tests/ui/traits/const-traits/const-impl-requires-const-trait.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-requires-const-trait.stderr
rename to tests/ui/traits/const-traits/const-impl-requires-const-trait.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.rs b/tests/ui/traits/const-traits/const-impl-trait.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.rs
rename to tests/ui/traits/const-traits/const-impl-trait.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.stderr b/tests/ui/traits/const-traits/const-impl-trait.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-impl-trait.stderr
rename to tests/ui/traits/const-traits/const-impl-trait.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds-trait-objects.rs b/tests/ui/traits/const-traits/const-trait-bounds-trait-objects.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds-trait-objects.rs
rename to tests/ui/traits/const-traits/const-trait-bounds-trait-objects.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds-trait-objects.stderr b/tests/ui/traits/const-traits/const-trait-bounds-trait-objects.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds-trait-objects.stderr
rename to tests/ui/traits/const-traits/const-trait-bounds-trait-objects.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.rs b/tests/ui/traits/const-traits/const-trait-bounds.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.rs
rename to tests/ui/traits/const-traits/const-trait-bounds.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr b/tests/ui/traits/const-traits/const-trait-bounds.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const-trait-bounds.stderr
rename to tests/ui/traits/const-traits/const-trait-bounds.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs b/tests/ui/traits/const-traits/const_derives/derive-const-gate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
rename to tests/ui/traits/const-traits/const_derives/derive-const-gate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr b/tests/ui/traits/const-traits/const_derives/derive-const-gate.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
rename to tests/ui/traits/const-traits/const_derives/derive-const-gate.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs b/tests/ui/traits/const-traits/const_derives/derive-const-non-const-type.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
rename to tests/ui/traits/const-traits/const_derives/derive-const-non-const-type.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr b/tests/ui/traits/const-traits/const_derives/derive-const-non-const-type.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
rename to tests/ui/traits/const-traits/const_derives/derive-const-non-const-type.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs b/tests/ui/traits/const-traits/const_derives/derive-const-use.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
rename to tests/ui/traits/const-traits/const_derives/derive-const-use.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr b/tests/ui/traits/const-traits/const_derives/derive-const-use.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-use.stderr
rename to tests/ui/traits/const-traits/const_derives/derive-const-use.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs b/tests/ui/traits/const-traits/const_derives/derive-const-with-params.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.rs
rename to tests/ui/traits/const-traits/const_derives/derive-const-with-params.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr b/tests/ui/traits/const-traits/const_derives/derive-const-with-params.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/const_derives/derive-const-with-params.stderr
rename to tests/ui/traits/const-traits/const_derives/derive-const-with-params.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs b/tests/ui/traits/const-traits/cross-crate-default-method-body-is-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate-default-method-body-is-const.rs
rename to tests/ui/traits/const-traits/cross-crate-default-method-body-is-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr b/tests/ui/traits/const-traits/cross-crate.gatednc.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.gatednc.stderr
rename to tests/ui/traits/const-traits/cross-crate.gatednc.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.rs b/tests/ui/traits/const-traits/cross-crate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.rs
rename to tests/ui/traits/const-traits/cross-crate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stock.stderr b/tests/ui/traits/const-traits/cross-crate.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stock.stderr
rename to tests/ui/traits/const-traits/cross-crate.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr b/tests/ui/traits/const-traits/cross-crate.stocknc.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/cross-crate.stocknc.stderr
rename to tests/ui/traits/const-traits/cross-crate.stocknc.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs b/tests/ui/traits/const-traits/default-method-body-is-const-body-checking.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-body-checking.rs
rename to tests/ui/traits/const-traits/default-method-body-is-const-body-checking.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs b/tests/ui/traits/const-traits/default-method-body-is-const-same-trait-ck.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.rs
rename to tests/ui/traits/const-traits/default-method-body-is-const-same-trait-ck.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr b/tests/ui/traits/const-traits/default-method-body-is-const-same-trait-ck.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-same-trait-ck.stderr
rename to tests/ui/traits/const-traits/default-method-body-is-const-same-trait-ck.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs b/tests/ui/traits/const-traits/default-method-body-is-const-with-staged-api.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs
rename to tests/ui/traits/const-traits/default-method-body-is-const-with-staged-api.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check-override.rs b/tests/ui/traits/const-traits/do-not-const-check-override.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check-override.rs
rename to tests/ui/traits/const-traits/do-not-const-check-override.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check.rs b/tests/ui/traits/const-traits/do-not-const-check.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/do-not-const-check.rs
rename to tests/ui/traits/const-traits/do-not-const-check.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/auxiliary/cross-crate.rs b/tests/ui/traits/const-traits/effects/auxiliary/cross-crate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/auxiliary/cross-crate.rs
rename to tests/ui/traits/const-traits/effects/auxiliary/cross-crate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/const_closure-const_trait_impl-ice-113381.rs b/tests/ui/traits/const-traits/effects/const_closure-const_trait_impl-ice-113381.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/const_closure-const_trait_impl-ice-113381.rs
rename to tests/ui/traits/const-traits/effects/const_closure-const_trait_impl-ice-113381.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/effect-param-infer.rs b/tests/ui/traits/const-traits/effects/effect-param-infer.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/effect-param-infer.rs
rename to tests/ui/traits/const-traits/effects/effect-param-infer.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/fallback.rs b/tests/ui/traits/const-traits/effects/fallback.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/fallback.rs
rename to tests/ui/traits/const-traits/effects/fallback.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/group-traits.rs b/tests/ui/traits/const-traits/effects/group-traits.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/group-traits.rs
rename to tests/ui/traits/const-traits/effects/group-traits.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs b/tests/ui/traits/const-traits/effects/helloworld.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs
rename to tests/ui/traits/const-traits/effects/helloworld.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-112822-expected-type-for-param.rs b/tests/ui/traits/const-traits/effects/ice-112822-expected-type-for-param.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-112822-expected-type-for-param.rs
rename to tests/ui/traits/const-traits/effects/ice-112822-expected-type-for-param.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-112822-expected-type-for-param.stderr b/tests/ui/traits/const-traits/effects/ice-112822-expected-type-for-param.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-112822-expected-type-for-param.stderr
rename to tests/ui/traits/const-traits/effects/ice-112822-expected-type-for-param.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-113375-index-out-of-bounds-generics.rs b/tests/ui/traits/const-traits/effects/ice-113375-index-out-of-bounds-generics.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/ice-113375-index-out-of-bounds-generics.rs
rename to tests/ui/traits/const-traits/effects/ice-113375-index-out-of-bounds-generics.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/infer-fallback.rs b/tests/ui/traits/const-traits/effects/infer-fallback.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/infer-fallback.rs
rename to tests/ui/traits/const-traits/effects/infer-fallback.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs b/tests/ui/traits/const-traits/effects/minicore.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs
rename to tests/ui/traits/const-traits/effects/minicore.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.stderr b/tests/ui/traits/const-traits/effects/minicore.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.stderr
rename to tests/ui/traits/const-traits/effects/minicore.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/mismatched_generic_args.rs b/tests/ui/traits/const-traits/effects/mismatched_generic_args.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/mismatched_generic_args.rs
rename to tests/ui/traits/const-traits/effects/mismatched_generic_args.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/mismatched_generic_args.stderr b/tests/ui/traits/const-traits/effects/mismatched_generic_args.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/mismatched_generic_args.stderr
rename to tests/ui/traits/const-traits/effects/mismatched_generic_args.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.rs b/tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.rs
rename to tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.stderr b/tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.stderr
rename to tests/ui/traits/const-traits/effects/no-explicit-const-params-cross-crate.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.rs b/tests/ui/traits/const-traits/effects/no-explicit-const-params.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.rs
rename to tests/ui/traits/const-traits/effects/no-explicit-const-params.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.stderr b/tests/ui/traits/const-traits/effects/no-explicit-const-params.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.stderr
rename to tests/ui/traits/const-traits/effects/no-explicit-const-params.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/project.rs b/tests/ui/traits/const-traits/effects/project.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/project.rs
rename to tests/ui/traits/const-traits/effects/project.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/span-bug-issue-121418.rs b/tests/ui/traits/const-traits/effects/span-bug-issue-121418.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/span-bug-issue-121418.rs
rename to tests/ui/traits/const-traits/effects/span-bug-issue-121418.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/span-bug-issue-121418.stderr b/tests/ui/traits/const-traits/effects/span-bug-issue-121418.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/span-bug-issue-121418.stderr
rename to tests/ui/traits/const-traits/effects/span-bug-issue-121418.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/spec-effectvar-ice.rs b/tests/ui/traits/const-traits/effects/spec-effectvar-ice.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/spec-effectvar-ice.rs
rename to tests/ui/traits/const-traits/effects/spec-effectvar-ice.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/spec-effectvar-ice.stderr b/tests/ui/traits/const-traits/effects/spec-effectvar-ice.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/spec-effectvar-ice.stderr
rename to tests/ui/traits/const-traits/effects/spec-effectvar-ice.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.rs b/tests/ui/traits/const-traits/effects/trait-fn-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.rs
rename to tests/ui/traits/const-traits/effects/trait-fn-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.stderr b/tests/ui/traits/const-traits/effects/trait-fn-const.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.stderr
rename to tests/ui/traits/const-traits/effects/trait-fn-const.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.coherence.stderr b/tests/ui/traits/const-traits/effects/with-without-next-solver.coherence.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.coherence.stderr
rename to tests/ui/traits/const-traits/effects/with-without-next-solver.coherence.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.rs b/tests/ui/traits/const-traits/effects/with-without-next-solver.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.rs
rename to tests/ui/traits/const-traits/effects/with-without-next-solver.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.stock.stderr b/tests/ui/traits/const-traits/effects/with-without-next-solver.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/effects/with-without-next-solver.stock.stderr
rename to tests/ui/traits/const-traits/effects/with-without-next-solver.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr b/tests/ui/traits/const-traits/feature-gate.gated.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.gated.stderr
rename to tests/ui/traits/const-traits/feature-gate.gated.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs b/tests/ui/traits/const-traits/feature-gate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.rs
rename to tests/ui/traits/const-traits/feature-gate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr b/tests/ui/traits/const-traits/feature-gate.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/feature-gate.stock.stderr
rename to tests/ui/traits/const-traits/feature-gate.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs b/tests/ui/traits/const-traits/function-pointer-does-not-require-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/function-pointer-does-not-require-const.rs
rename to tests/ui/traits/const-traits/function-pointer-does-not-require-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/gate.rs b/tests/ui/traits/const-traits/gate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/gate.rs
rename to tests/ui/traits/const-traits/gate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/gate.stderr b/tests/ui/traits/const-traits/gate.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/gate.stderr
rename to tests/ui/traits/const-traits/gate.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs b/tests/ui/traits/const-traits/generic-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.rs
rename to tests/ui/traits/const-traits/generic-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.stderr b/tests/ui/traits/const-traits/generic-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/generic-bound.stderr
rename to tests/ui/traits/const-traits/generic-bound.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs b/tests/ui/traits/const-traits/hir-const-check.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.rs
rename to tests/ui/traits/const-traits/hir-const-check.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr b/tests/ui/traits/const-traits/hir-const-check.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/hir-const-check.stderr
rename to tests/ui/traits/const-traits/hir-const-check.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-119717-constant-lifetime.rs b/tests/ui/traits/const-traits/ice-119717-constant-lifetime.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-119717-constant-lifetime.rs
rename to tests/ui/traits/const-traits/ice-119717-constant-lifetime.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-119717-constant-lifetime.stderr b/tests/ui/traits/const-traits/ice-119717-constant-lifetime.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-119717-constant-lifetime.stderr
rename to tests/ui/traits/const-traits/ice-119717-constant-lifetime.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-120503-async-const-method.rs b/tests/ui/traits/const-traits/ice-120503-async-const-method.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-120503-async-const-method.rs
rename to tests/ui/traits/const-traits/ice-120503-async-const-method.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-120503-async-const-method.stderr b/tests/ui/traits/const-traits/ice-120503-async-const-method.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-120503-async-const-method.stderr
rename to tests/ui/traits/const-traits/ice-120503-async-const-method.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-121536-const-method.rs b/tests/ui/traits/const-traits/ice-121536-const-method.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-121536-const-method.rs
rename to tests/ui/traits/const-traits/ice-121536-const-method.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-121536-const-method.stderr b/tests/ui/traits/const-traits/ice-121536-const-method.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-121536-const-method.stderr
rename to tests/ui/traits/const-traits/ice-121536-const-method.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-123664-unexpected-bound-var.rs b/tests/ui/traits/const-traits/ice-123664-unexpected-bound-var.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-123664-unexpected-bound-var.rs
rename to tests/ui/traits/const-traits/ice-123664-unexpected-bound-var.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-123664-unexpected-bound-var.stderr b/tests/ui/traits/const-traits/ice-123664-unexpected-bound-var.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-123664-unexpected-bound-var.stderr
rename to tests/ui/traits/const-traits/ice-123664-unexpected-bound-var.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-124857-combine-effect-const-infer-vars.rs b/tests/ui/traits/const-traits/ice-124857-combine-effect-const-infer-vars.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-124857-combine-effect-const-infer-vars.rs
rename to tests/ui/traits/const-traits/ice-124857-combine-effect-const-infer-vars.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-124857-combine-effect-const-infer-vars.stderr b/tests/ui/traits/const-traits/ice-124857-combine-effect-const-infer-vars.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-124857-combine-effect-const-infer-vars.stderr
rename to tests/ui/traits/const-traits/ice-124857-combine-effect-const-infer-vars.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-126148-failed-to-normalize.rs b/tests/ui/traits/const-traits/ice-126148-failed-to-normalize.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-126148-failed-to-normalize.rs
rename to tests/ui/traits/const-traits/ice-126148-failed-to-normalize.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/ice-126148-failed-to-normalize.stderr b/tests/ui/traits/const-traits/ice-126148-failed-to-normalize.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/ice-126148-failed-to-normalize.stderr
rename to tests/ui/traits/const-traits/ice-126148-failed-to-normalize.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs b/tests/ui/traits/const-traits/impl-tilde-const-trait.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.rs
rename to tests/ui/traits/const-traits/impl-tilde-const-trait.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr b/tests/ui/traits/const-traits/impl-tilde-const-trait.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/impl-tilde-const-trait.stderr
rename to tests/ui/traits/const-traits/impl-tilde-const-trait.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs b/tests/ui/traits/const-traits/impl-with-default-fn-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.rs
rename to tests/ui/traits/const-traits/impl-with-default-fn-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr b/tests/ui/traits/const-traits/impl-with-default-fn-fail.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-fail.stderr
rename to tests/ui/traits/const-traits/impl-with-default-fn-fail.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs b/tests/ui/traits/const-traits/impl-with-default-fn-pass.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/impl-with-default-fn-pass.rs
rename to tests/ui/traits/const-traits/impl-with-default-fn-pass.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs b/tests/ui/traits/const-traits/inherent-impl-const-bounds.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl-const-bounds.rs
rename to tests/ui/traits/const-traits/inherent-impl-const-bounds.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs b/tests/ui/traits/const-traits/inherent-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.rs
rename to tests/ui/traits/const-traits/inherent-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr b/tests/ui/traits/const-traits/inherent-impl.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/inherent-impl.stderr
rename to tests/ui/traits/const-traits/inherent-impl.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/inline-incorrect-early-bound-in-ctfe.rs b/tests/ui/traits/const-traits/inline-incorrect-early-bound-in-ctfe.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/inline-incorrect-early-bound-in-ctfe.rs
rename to tests/ui/traits/const-traits/inline-incorrect-early-bound-in-ctfe.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/inline-incorrect-early-bound-in-ctfe.stderr b/tests/ui/traits/const-traits/inline-incorrect-early-bound-in-ctfe.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/inline-incorrect-early-bound-in-ctfe.stderr
rename to tests/ui/traits/const-traits/inline-incorrect-early-bound-in-ctfe.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-100222.rs b/tests/ui/traits/const-traits/issue-100222.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-100222.rs
rename to tests/ui/traits/const-traits/issue-100222.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.rs b/tests/ui/traits/const-traits/issue-102156.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.rs
rename to tests/ui/traits/const-traits/issue-102156.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.stderr b/tests/ui/traits/const-traits/issue-102156.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102156.stderr
rename to tests/ui/traits/const-traits/issue-102156.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.rs b/tests/ui/traits/const-traits/issue-102985.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.rs
rename to tests/ui/traits/const-traits/issue-102985.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.stderr b/tests/ui/traits/const-traits/issue-102985.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-102985.stderr
rename to tests/ui/traits/const-traits/issue-102985.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-103677.rs b/tests/ui/traits/const-traits/issue-103677.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-103677.rs
rename to tests/ui/traits/const-traits/issue-103677.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.rs b/tests/ui/traits/const-traits/issue-79450.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.rs
rename to tests/ui/traits/const-traits/issue-79450.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.stderr b/tests/ui/traits/const-traits/issue-79450.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-79450.stderr
rename to tests/ui/traits/const-traits/issue-79450.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.rs b/tests/ui/traits/const-traits/issue-88155.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.rs
rename to tests/ui/traits/const-traits/issue-88155.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.stderr b/tests/ui/traits/const-traits/issue-88155.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-88155.stderr
rename to tests/ui/traits/const-traits/issue-88155.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.rs b/tests/ui/traits/const-traits/issue-92111.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.rs
rename to tests/ui/traits/const-traits/issue-92111.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.stderr b/tests/ui/traits/const-traits/issue-92111.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92111.stderr
rename to tests/ui/traits/const-traits/issue-92111.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs b/tests/ui/traits/const-traits/issue-92230-wf-super-trait-env.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/issue-92230-wf-super-trait-env.rs
rename to tests/ui/traits/const-traits/issue-92230-wf-super-trait-env.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.gated.stderr b/tests/ui/traits/const-traits/match-non-const-eq.gated.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.gated.stderr
rename to tests/ui/traits/const-traits/match-non-const-eq.gated.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.rs b/tests/ui/traits/const-traits/match-non-const-eq.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.rs
rename to tests/ui/traits/const-traits/match-non-const-eq.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.stock.stderr b/tests/ui/traits/const-traits/match-non-const-eq.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/match-non-const-eq.stock.stderr
rename to tests/ui/traits/const-traits/match-non-const-eq.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-bare-trait-objects-const-trait-bounds.rs b/tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-bare-trait-objects-const-trait-bounds.rs
rename to tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-const-trait-bound-theoretical-regression.rs b/tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-const-trait-bound-theoretical-regression.rs
rename to tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-const-trait-bound-theoretical-regression.stderr b/tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-const-trait-bound-theoretical-regression.stderr
rename to tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-dyn-const-2015.rs b/tests/ui/traits/const-traits/mbe-dyn-const-2015.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mbe-dyn-const-2015.rs
rename to tests/ui/traits/const-traits/mbe-dyn-const-2015.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mutually-exclusive-trait-bound-modifiers.rs b/tests/ui/traits/const-traits/mutually-exclusive-trait-bound-modifiers.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mutually-exclusive-trait-bound-modifiers.rs
rename to tests/ui/traits/const-traits/mutually-exclusive-trait-bound-modifiers.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/mutually-exclusive-trait-bound-modifiers.stderr b/tests/ui/traits/const-traits/mutually-exclusive-trait-bound-modifiers.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/mutually-exclusive-trait-bound-modifiers.stderr
rename to tests/ui/traits/const-traits/mutually-exclusive-trait-bound-modifiers.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/nested-closure.rs b/tests/ui/traits/const-traits/nested-closure.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/nested-closure.rs
rename to tests/ui/traits/const-traits/nested-closure.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs b/tests/ui/traits/const-traits/non-const-op-const-closure-non-const-outer.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.rs
rename to tests/ui/traits/const-traits/non-const-op-const-closure-non-const-outer.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr b/tests/ui/traits/const-traits/non-const-op-const-closure-non-const-outer.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-const-closure-non-const-outer.stderr
rename to tests/ui/traits/const-traits/non-const-op-const-closure-non-const-outer.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs b/tests/ui/traits/const-traits/non-const-op-in-closure-in-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.rs
rename to tests/ui/traits/const-traits/non-const-op-in-closure-in-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr b/tests/ui/traits/const-traits/non-const-op-in-closure-in-const.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/non-const-op-in-closure-in-const.stderr
rename to tests/ui/traits/const-traits/non-const-op-in-closure-in-const.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs b/tests/ui/traits/const-traits/specialization/const-default-bound-non-const-specialized-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.rs
rename to tests/ui/traits/const-traits/specialization/const-default-bound-non-const-specialized-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr b/tests/ui/traits/const-traits/specialization/const-default-bound-non-const-specialized-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
rename to tests/ui/traits/const-traits/specialization/const-default-bound-non-const-specialized-bound.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs b/tests/ui/traits/const-traits/specialization/const-default-const-specialized.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.rs
rename to tests/ui/traits/const-traits/specialization/const-default-const-specialized.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.stderr b/tests/ui/traits/const-traits/specialization/const-default-const-specialized.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-const-specialized.stderr
rename to tests/ui/traits/const-traits/specialization/const-default-const-specialized.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs b/tests/ui/traits/const-traits/specialization/const-default-impl-non-const-specialized-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.rs
rename to tests/ui/traits/const-traits/specialization/const-default-impl-non-const-specialized-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr b/tests/ui/traits/const-traits/specialization/const-default-impl-non-const-specialized-impl.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-impl-non-const-specialized-impl.stderr
rename to tests/ui/traits/const-traits/specialization/const-default-impl-non-const-specialized-impl.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.rs b/tests/ui/traits/const-traits/specialization/default-keyword.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.rs
rename to tests/ui/traits/const-traits/specialization/default-keyword.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.stderr b/tests/ui/traits/const-traits/specialization/default-keyword.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/default-keyword.stderr
rename to tests/ui/traits/const-traits/specialization/default-keyword.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs b/tests/ui/traits/const-traits/specialization/issue-95186-specialize-on-tilde-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.rs
rename to tests/ui/traits/const-traits/specialization/issue-95186-specialize-on-tilde-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.stderr b/tests/ui/traits/const-traits/specialization/issue-95186-specialize-on-tilde-const.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95186-specialize-on-tilde-const.stderr
rename to tests/ui/traits/const-traits/specialization/issue-95186-specialize-on-tilde-const.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs b/tests/ui/traits/const-traits/specialization/issue-95187-same-trait-bound-different-constness.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.rs
rename to tests/ui/traits/const-traits/specialization/issue-95187-same-trait-bound-different-constness.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.stderr b/tests/ui/traits/const-traits/specialization/issue-95187-same-trait-bound-different-constness.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/issue-95187-same-trait-bound-different-constness.stderr
rename to tests/ui/traits/const-traits/specialization/issue-95187-same-trait-bound-different-constness.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs b/tests/ui/traits/const-traits/specialization/non-const-default-const-specialized.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.rs
rename to tests/ui/traits/const-traits/specialization/non-const-default-const-specialized.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.stderr b/tests/ui/traits/const-traits/specialization/non-const-default-const-specialized.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/non-const-default-const-specialized.stderr
rename to tests/ui/traits/const-traits/specialization/non-const-default-const-specialized.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.rs b/tests/ui/traits/const-traits/specializing-constness-2.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.rs
rename to tests/ui/traits/const-traits/specializing-constness-2.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.stderr b/tests/ui/traits/const-traits/specializing-constness-2.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness-2.stderr
rename to tests/ui/traits/const-traits/specializing-constness-2.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.rs b/tests/ui/traits/const-traits/specializing-constness.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.rs
rename to tests/ui/traits/const-traits/specializing-constness.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.stderr b/tests/ui/traits/const-traits/specializing-constness.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/specializing-constness.stderr
rename to tests/ui/traits/const-traits/specializing-constness.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.rs b/tests/ui/traits/const-traits/staged-api-user-crate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.rs
rename to tests/ui/traits/const-traits/staged-api-user-crate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.stderr b/tests/ui/traits/const-traits/staged-api-user-crate.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api-user-crate.stderr
rename to tests/ui/traits/const-traits/staged-api-user-crate.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.rs b/tests/ui/traits/const-traits/staged-api.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.rs
rename to tests/ui/traits/const-traits/staged-api.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.stable.stderr b/tests/ui/traits/const-traits/staged-api.stable.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.stable.stderr
rename to tests/ui/traits/const-traits/staged-api.stable.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.unstable.stderr b/tests/ui/traits/const-traits/staged-api.unstable.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/staged-api.unstable.stderr
rename to tests/ui/traits/const-traits/staged-api.unstable.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/static-const-trait-bound.rs b/tests/ui/traits/const-traits/static-const-trait-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/static-const-trait-bound.rs
rename to tests/ui/traits/const-traits/static-const-trait-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr b/tests/ui/traits/const-traits/std-impl-gate.gated.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.gated.stderr
rename to tests/ui/traits/const-traits/std-impl-gate.gated.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.rs b/tests/ui/traits/const-traits/std-impl-gate.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.rs
rename to tests/ui/traits/const-traits/std-impl-gate.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr b/tests/ui/traits/const-traits/std-impl-gate.stock.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/std-impl-gate.stock.stderr
rename to tests/ui/traits/const-traits/std-impl-gate.stock.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr b/tests/ui/traits/const-traits/super-traits-fail-2.nn.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.nn.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-2.nn.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr b/tests/ui/traits/const-traits/super-traits-fail-2.ny.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.ny.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-2.ny.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.rs b/tests/ui/traits/const-traits/super-traits-fail-2.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.rs
rename to tests/ui/traits/const-traits/super-traits-fail-2.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr b/tests/ui/traits/const-traits/super-traits-fail-2.yn.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yn.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-2.yn.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr b/tests/ui/traits/const-traits/super-traits-fail-2.yy.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-2.yy.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-2.yy.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr b/tests/ui/traits/const-traits/super-traits-fail-3.nn.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.nn.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-3.nn.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr b/tests/ui/traits/const-traits/super-traits-fail-3.ny.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.ny.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-3.ny.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.rs b/tests/ui/traits/const-traits/super-traits-fail-3.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.rs
rename to tests/ui/traits/const-traits/super-traits-fail-3.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr b/tests/ui/traits/const-traits/super-traits-fail-3.yn.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail-3.yn.stderr
rename to tests/ui/traits/const-traits/super-traits-fail-3.yn.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.rs b/tests/ui/traits/const-traits/super-traits-fail.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.rs
rename to tests/ui/traits/const-traits/super-traits-fail.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.stderr b/tests/ui/traits/const-traits/super-traits-fail.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits-fail.stderr
rename to tests/ui/traits/const-traits/super-traits-fail.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits.rs b/tests/ui/traits/const-traits/super-traits.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/super-traits.rs
rename to tests/ui/traits/const-traits/super-traits.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs b/tests/ui/traits/const-traits/syntax.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/syntax.rs
rename to tests/ui/traits/const-traits/syntax.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs b/tests/ui/traits/const-traits/tilde-const-and-const-params.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.rs
rename to tests/ui/traits/const-traits/tilde-const-and-const-params.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr b/tests/ui/traits/const-traits/tilde-const-and-const-params.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-and-const-params.stderr
rename to tests/ui/traits/const-traits/tilde-const-and-const-params.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-assoc-fn-in-trait-impl.rs b/tests/ui/traits/const-traits/tilde-const-assoc-fn-in-trait-impl.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-assoc-fn-in-trait-impl.rs
rename to tests/ui/traits/const-traits/tilde-const-assoc-fn-in-trait-impl.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-inherent-assoc-const-fn.rs b/tests/ui/traits/const-traits/tilde-const-inherent-assoc-const-fn.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-inherent-assoc-const-fn.rs
rename to tests/ui/traits/const-traits/tilde-const-inherent-assoc-const-fn.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs b/tests/ui/traits/const-traits/tilde-const-invalid-places.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.rs
rename to tests/ui/traits/const-traits/tilde-const-invalid-places.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr b/tests/ui/traits/const-traits/tilde-const-invalid-places.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-invalid-places.stderr
rename to tests/ui/traits/const-traits/tilde-const-invalid-places.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-syntax.rs b/tests/ui/traits/const-traits/tilde-const-syntax.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-syntax.rs
rename to tests/ui/traits/const-traits/tilde-const-syntax.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-trait-assoc-tys.rs b/tests/ui/traits/const-traits/tilde-const-trait-assoc-tys.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-const-trait-assoc-tys.rs
rename to tests/ui/traits/const-traits/tilde-const-trait-assoc-tys.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.rs b/tests/ui/traits/const-traits/tilde-twice.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.rs
rename to tests/ui/traits/const-traits/tilde-twice.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.stderr b/tests/ui/traits/const-traits/tilde-twice.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/tilde-twice.stderr
rename to tests/ui/traits/const-traits/tilde-twice.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.rs b/tests/ui/traits/const-traits/trait-default-body-stability.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.rs
rename to tests/ui/traits/const-traits/trait-default-body-stability.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.stderr b/tests/ui/traits/const-traits/trait-default-body-stability.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-default-body-stability.stderr
rename to tests/ui/traits/const-traits/trait-default-body-stability.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs b/tests/ui/traits/const-traits/trait-method-ptr-in-consts-ice.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-method-ptr-in-consts-ice.rs
rename to tests/ui/traits/const-traits/trait-method-ptr-in-consts-ice.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.rs b/tests/ui/traits/const-traits/trait-where-clause-const.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.rs
rename to tests/ui/traits/const-traits/trait-where-clause-const.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.stderr b/tests/ui/traits/const-traits/trait-where-clause-const.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-const.stderr
rename to tests/ui/traits/const-traits/trait-where-clause-const.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-run.rs b/tests/ui/traits/const-traits/trait-where-clause-run.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-run.rs
rename to tests/ui/traits/const-traits/trait-where-clause-run.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs b/tests/ui/traits/const-traits/trait-where-clause-self-referential.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs
rename to tests/ui/traits/const-traits/trait-where-clause-self-referential.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.rs b/tests/ui/traits/const-traits/trait-where-clause.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.rs
rename to tests/ui/traits/const-traits/trait-where-clause.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr b/tests/ui/traits/const-traits/trait-where-clause.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/trait-where-clause.stderr
rename to tests/ui/traits/const-traits/trait-where-clause.stderr
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/unsatisfied-const-trait-bound.rs b/tests/ui/traits/const-traits/unsatisfied-const-trait-bound.rs
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/unsatisfied-const-trait-bound.rs
rename to tests/ui/traits/const-traits/unsatisfied-const-trait-bound.rs
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/unsatisfied-const-trait-bound.stderr b/tests/ui/traits/const-traits/unsatisfied-const-trait-bound.stderr
similarity index 100%
rename from tests/ui/rfcs/rfc-2632-const-trait-impl/unsatisfied-const-trait-bound.stderr
rename to tests/ui/traits/const-traits/unsatisfied-const-trait-bound.stderr