From 094707087171bb698d47aba807cd7d78c58e63ab Mon Sep 17 00:00:00 2001 From: lcnr Date: Thu, 14 Dec 2023 14:47:41 +0100 Subject: [PATCH] consistently use "next solver" instead of "new solver" --- compiler/rustc_borrowck/src/type_check/mod.rs | 4 ++-- compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs | 2 +- compiler/rustc_trait_selection/src/solve/search_graph.rs | 6 +++--- .../src/traits/query/type_op/ascribe_user_type.rs | 2 +- .../rustc_trait_selection/src/traits/query/type_op/eq.rs | 2 +- .../src/traits/query/type_op/implied_outlives_bounds.rs | 2 +- .../rustc_trait_selection/src/traits/query/type_op/mod.rs | 4 ++-- .../src/traits/query/type_op/normalize.rs | 2 +- .../src/traits/query/type_op/outlives.rs | 2 +- .../src/traits/query/type_op/prove_predicate.rs | 2 +- .../src/traits/query/type_op/subtype.rs | 2 +- .../{new-solver => next-solver}/alias-bound-preference.rs | 0 .../{new-solver => next-solver}/alias-bound-unsound.rs | 0 .../{new-solver => next-solver}/alias-bound-unsound.stderr | 0 .../alias-eq-in-canonical-response.rs | 0 .../alias-relate/deeply-nested-no-hang.rs | 0 .../alias-relate/opaque-hidden-ty-is-rigid-alias.rs | 0 tests/ui/traits/{new-solver => next-solver}/alias-sub.rs | 0 .../alias_eq_cant_be_furthur_normalized.rs | 0 .../alias_eq_dont_use_normalizes_to_if_substs_eq.rs | 0 .../traits/{new-solver => next-solver}/alias_eq_simple.rs | 0 .../alias_eq_substs_eq_not_intercrate.rs | 0 .../alias_eq_substs_eq_not_intercrate.stderr | 0 .../ui/traits/{new-solver => next-solver}/array-default.rs | 0 .../assembly/assemble-normalizing-self-ty-impl-ambiguity.rs | 0 .../assembly/runaway-impl-candidate-selection.rs | 0 .../assembly/runaway-impl-candidate-selection.stderr | 0 .../ui/traits/{new-solver => next-solver}/async.fail.stderr | 0 tests/ui/traits/{new-solver => next-solver}/async.rs | 0 .../auto-with-drop_tracking_mir.fail.stderr | 0 .../auto-with-drop_tracking_mir.rs | 0 .../ui/traits/{new-solver => next-solver}/borrowck-error.rs | 0 .../{new-solver => next-solver}/borrowck-error.stderr | 0 .../builtin-fn-must-return-sized.rs | 0 .../builtin-fn-must-return-sized.stderr | 0 .../canonical-int-var-eq-in-response.rs | 0 .../canonical-ty-var-eq-in-response.rs | 0 .../{new-solver => next-solver}/canonicalize-effect-var.rs | 0 .../cast-checks-handling-projections.rs | 0 .../closure-inference-guidance.rs | 0 .../{new-solver => next-solver}/closure-substs-ambiguity.rs | 0 .../{new-solver => next-solver}/coherence/issue-102048.rs | 0 .../coherence/issue-102048.stderr | 0 .../coherence/trait_ref_is_knowable-norm-overflow.rs | 0 .../coherence/trait_ref_is_knowable-norm-overflow.stderr | 0 .../coherence/trait_ref_is_knowable-normalization-1.rs | 0 .../coherence/trait_ref_is_knowable-normalization-2.rs | 0 .../coherence/trait_ref_is_knowable-normalization-3.rs | 0 .../const-param-placeholder.fail.stderr | 0 .../{new-solver => next-solver}/const-param-placeholder.rs | 0 .../{new-solver => next-solver}/coroutine.fail.stderr | 0 tests/ui/traits/{new-solver => next-solver}/coroutine.rs | 0 .../cycles/coinduction/fixpoint-exponential-growth.rs | 0 .../cycles/coinduction/fixpoint-exponential-growth.stderr | 0 .../cycles/coinduction/incompleteness-unstable-result.rs | 0 .../coinduction/incompleteness-unstable-result.stderr | 0 .../cycles/double-cycle-inductive-coinductive.rs | 0 .../cycles/double-cycle-inductive-coinductive.stderr | 0 .../cycles/fixpoint-rerun-all-cycle-heads.rs | 0 .../cycles/fixpoint-rerun-all-cycle-heads.stderr | 0 .../cycles/inductive-cycle-but-err.rs | 0 .../cycles/inductive-cycle-but-err.stderr | 0 .../cycles/inductive-cycle-but-ok.rs | 0 .../inductive-cycle-discarded-coinductive-constraints.rs | 0 .../cycles/inductive-fixpoint-hang.rs | 0 .../cycles/inductive-fixpoint-hang.stderr | 0 .../cycles/inductive-not-on-stack.rs | 0 .../cycles/inductive-not-on-stack.stderr | 0 .../cycles/leak-check-coinductive-cycle.rs | 0 .../cycles/provisional-result-done.rs | 0 .../deduce-closure-signature-after-normalization.rs | 0 .../{new-solver => next-solver}/deduce-ty-from-object.rs | 0 .../ui/traits/{new-solver => next-solver}/dedup-regions.rs | 0 tests/ui/traits/{new-solver => next-solver}/destruct.rs | 0 .../{new-solver => next-solver}/dont-coerce-infer-to-dyn.rs | 0 .../dont-elaborate-for-projections.rs | 0 .../dont-ice-on-assoc-projection.rs | 0 .../dont-ice-on-assoc-projection.stderr | 0 .../dont-loop-fulfill-on-region-constraints.rs | 0 .../dont-normalize-proj-with-error.rs | 0 .../dont-normalize-proj-with-error.stderr | 0 .../{new-solver => next-solver}/dont-remap-tait-substs.rs | 0 .../dont-type_of-tait-in-defining-scope.not_send.stderr | 0 .../dont-type_of-tait-in-defining-scope.rs | 0 .../{new-solver => next-solver}/dyn-any-dont-prefer-impl.rs | 0 .../{new-solver => next-solver}/elaborate-item-bounds.rs | 0 .../equating-projection-cyclically.rs | 0 .../escaping-bound-vars-in-writeback-normalization.rs | 0 .../traits/{new-solver => next-solver}/float-canonical.rs | 0 .../traits/{new-solver => next-solver}/fn-trait-closure.rs | 0 tests/ui/traits/{new-solver => next-solver}/fn-trait.rs | 0 tests/ui/traits/{new-solver => next-solver}/fn-trait.stderr | 0 .../generalize/generalize-proj-new-universe-index-1.rs | 0 .../generalize/generalize-proj-new-universe-index-2.rs | 0 .../generalize/generalize-proj-new-universe-index-2.stderr | 0 .../generalize/occurs-check-nested-alias.next.stderr | 0 .../generalize/occurs-check-nested-alias.rs | 0 .../{new-solver => next-solver}/higher-ranked-dyn-bounds.rs | 0 .../traits/{new-solver => next-solver}/int-var-alias-eq.rs | 0 .../traits/{new-solver => next-solver}/int-var-is-send.rs | 0 .../{new-solver => next-solver}/iter-filter-projection.rs | 0 .../lazy-nested-obligations-1.rs | 0 .../lazy-nested-obligations-2.rs | 0 .../lazy-nested-obligations-3.rs | 0 .../member-constraints-in-root-universe.rs | 0 .../traits/{new-solver => next-solver}/more-object-bound.rs | 0 .../{new-solver => next-solver}/more-object-bound.stderr | 0 .../negative-coherence-bounds.rs | 0 .../negative-coherence-bounds.stderr | 0 .../{new-solver => next-solver}/nested-alias-bound.rs | 0 .../nested-obligations-with-bound-vars-gat.rs | 0 .../normalize-async-closure-in-trait.rs | 0 .../{new-solver => next-solver}/normalize-param-env-1.rs | 0 .../{new-solver => next-solver}/normalize-param-env-2.rs | 0 .../{new-solver => next-solver}/normalize-param-env-3.rs | 0 .../normalize-rcvr-for-inherent.rs | 0 .../{new-solver => next-solver}/normalize-unsize-rhs.rs | 0 .../normalized-const-built-in-op.rs | 0 .../normalizes_to_ignores_unnormalizable_candidate.rs | 0 ...es_to_ignores_unnormalizable_candidate.self_infer.stderr | 0 .../object-soundness-requires-generalization.rs | 0 .../traits/{new-solver => next-solver}/object-unsafety.rs | 0 .../{new-solver => next-solver}/object-unsafety.stderr | 0 .../opportunistic-region-resolve.rs | 0 .../overflow/exponential-trait-goals.rs | 0 .../overflow/exponential-trait-goals.stderr | 0 .../{new-solver => next-solver}/overflow/global-cache.rs | 0 .../overflow/global-cache.stderr | 0 .../overflow/recursion-limit-zero-issue-115351.rs | 0 .../overflow/recursion-limit-zero-issue-115351.stderr | 0 .../overflow/recursive-self-normalization-2.rs | 0 .../overflow/recursive-self-normalization-2.stderr | 0 .../overflow/recursive-self-normalization.rs | 0 .../overflow/recursive-self-normalization.stderr | 0 .../param-candidate-doesnt-shadow-project.rs | 0 .../traits/{new-solver => next-solver}/param-discr-kind.rs | 0 tests/ui/traits/{new-solver => next-solver}/pointee.rs | 0 tests/ui/traits/{new-solver => next-solver}/pointer-like.rs | 0 .../traits/{new-solver => next-solver}/pointer-like.stderr | 0 .../prefer-candidate-no-constraints.rs | 0 .../prefer-param-env-on-ambiguity.rs | 0 .../{new-solver => next-solver}/projection-discr-kind.rs | 0 .../projection-discr-kind.stderr | 0 .../{new-solver => next-solver}/slice-match-byte-lit.rs | 0 .../{new-solver => next-solver}/specialization-transmute.rs | 0 .../specialization-transmute.stderr | 0 .../specialization-unconstrained.rs | 0 .../specialization-unconstrained.stderr | 0 .../stall-num-var-auto-trait.fallback.stderr | 0 .../{new-solver => next-solver}/stall-num-var-auto-trait.rs | 0 .../{new-solver => next-solver}/structural-resolve-field.rs | 0 .../ui/traits/{new-solver => next-solver}/tait-eq-proj-2.rs | 2 +- tests/ui/traits/{new-solver => next-solver}/tait-eq-proj.rs | 0 tests/ui/traits/{new-solver => next-solver}/tait-eq-tait.rs | 0 .../{new-solver => next-solver}/temporary-ambiguity.rs | 0 .../trait-upcast-lhs-needs-normalization.rs | 0 tests/ui/traits/{new-solver => next-solver}/try-example.rs | 0 .../two-projection-param-candidates-are-ambiguous.rs | 0 .../two-projection-param-candidates-are-ambiguous.stderr | 0 .../unevaluated-const-impl-trait-ref.fails.stderr | 0 .../unevaluated-const-impl-trait-ref.rs | 0 .../{new-solver => next-solver}/unsafe-auto-trait-impl.rs | 0 .../unsize-although-ambiguous.rs | 0 tests/ui/traits/{new-solver => next-solver}/unsize-good.rs | 0 .../{new-solver => next-solver}/upcast-right-substs.rs | 0 .../{new-solver => next-solver}/upcast-wrong-substs.rs | 0 .../{new-solver => next-solver}/upcast-wrong-substs.stderr | 0 .../winnow-specializing-impls.rs | 0 168 files changed, 16 insertions(+), 16 deletions(-) rename tests/ui/traits/{new-solver => next-solver}/alias-bound-preference.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-bound-unsound.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-bound-unsound.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-eq-in-canonical-response.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-relate/deeply-nested-no-hang.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-relate/opaque-hidden-ty-is-rigid-alias.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias-sub.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias_eq_cant_be_furthur_normalized.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias_eq_dont_use_normalizes_to_if_substs_eq.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias_eq_simple.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias_eq_substs_eq_not_intercrate.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/alias_eq_substs_eq_not_intercrate.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/array-default.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/assembly/assemble-normalizing-self-ty-impl-ambiguity.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/assembly/runaway-impl-candidate-selection.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/assembly/runaway-impl-candidate-selection.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/async.fail.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/async.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/auto-with-drop_tracking_mir.fail.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/auto-with-drop_tracking_mir.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/borrowck-error.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/borrowck-error.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/builtin-fn-must-return-sized.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/builtin-fn-must-return-sized.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/canonical-int-var-eq-in-response.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/canonical-ty-var-eq-in-response.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/canonicalize-effect-var.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cast-checks-handling-projections.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/closure-inference-guidance.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/closure-substs-ambiguity.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/issue-102048.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/issue-102048.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/trait_ref_is_knowable-norm-overflow.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/trait_ref_is_knowable-norm-overflow.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/trait_ref_is_knowable-normalization-1.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/trait_ref_is_knowable-normalization-2.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coherence/trait_ref_is_knowable-normalization-3.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/const-param-placeholder.fail.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/const-param-placeholder.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/coroutine.fail.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/coroutine.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/coinduction/fixpoint-exponential-growth.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/coinduction/fixpoint-exponential-growth.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/coinduction/incompleteness-unstable-result.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/coinduction/incompleteness-unstable-result.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/double-cycle-inductive-coinductive.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/double-cycle-inductive-coinductive.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/fixpoint-rerun-all-cycle-heads.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/fixpoint-rerun-all-cycle-heads.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-cycle-but-err.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-cycle-but-err.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-cycle-but-ok.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-cycle-discarded-coinductive-constraints.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-fixpoint-hang.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-fixpoint-hang.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-not-on-stack.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/inductive-not-on-stack.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/leak-check-coinductive-cycle.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/cycles/provisional-result-done.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/deduce-closure-signature-after-normalization.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/deduce-ty-from-object.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dedup-regions.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/destruct.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-coerce-infer-to-dyn.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-elaborate-for-projections.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-ice-on-assoc-projection.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-ice-on-assoc-projection.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-loop-fulfill-on-region-constraints.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-normalize-proj-with-error.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-normalize-proj-with-error.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-remap-tait-substs.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-type_of-tait-in-defining-scope.not_send.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/dont-type_of-tait-in-defining-scope.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/dyn-any-dont-prefer-impl.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/elaborate-item-bounds.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/equating-projection-cyclically.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/escaping-bound-vars-in-writeback-normalization.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/float-canonical.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/fn-trait-closure.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/fn-trait.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/fn-trait.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/generalize/generalize-proj-new-universe-index-1.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/generalize/generalize-proj-new-universe-index-2.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/generalize/generalize-proj-new-universe-index-2.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/generalize/occurs-check-nested-alias.next.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/generalize/occurs-check-nested-alias.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/higher-ranked-dyn-bounds.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/int-var-alias-eq.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/int-var-is-send.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/iter-filter-projection.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/lazy-nested-obligations-1.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/lazy-nested-obligations-2.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/lazy-nested-obligations-3.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/member-constraints-in-root-universe.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/more-object-bound.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/more-object-bound.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/negative-coherence-bounds.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/negative-coherence-bounds.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/nested-alias-bound.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/nested-obligations-with-bound-vars-gat.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-async-closure-in-trait.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-param-env-1.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-param-env-2.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-param-env-3.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-rcvr-for-inherent.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalize-unsize-rhs.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalized-const-built-in-op.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalizes_to_ignores_unnormalizable_candidate.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/normalizes_to_ignores_unnormalizable_candidate.self_infer.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/object-soundness-requires-generalization.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/object-unsafety.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/object-unsafety.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/opportunistic-region-resolve.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/exponential-trait-goals.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/exponential-trait-goals.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/global-cache.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/global-cache.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursion-limit-zero-issue-115351.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursion-limit-zero-issue-115351.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursive-self-normalization-2.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursive-self-normalization-2.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursive-self-normalization.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/overflow/recursive-self-normalization.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/param-candidate-doesnt-shadow-project.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/param-discr-kind.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/pointee.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/pointer-like.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/pointer-like.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/prefer-candidate-no-constraints.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/prefer-param-env-on-ambiguity.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/projection-discr-kind.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/projection-discr-kind.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/slice-match-byte-lit.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/specialization-transmute.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/specialization-transmute.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/specialization-unconstrained.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/specialization-unconstrained.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/stall-num-var-auto-trait.fallback.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/stall-num-var-auto-trait.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/structural-resolve-field.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/tait-eq-proj-2.rs (87%) rename tests/ui/traits/{new-solver => next-solver}/tait-eq-proj.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/tait-eq-tait.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/temporary-ambiguity.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/trait-upcast-lhs-needs-normalization.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/try-example.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/two-projection-param-candidates-are-ambiguous.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/two-projection-param-candidates-are-ambiguous.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/unevaluated-const-impl-trait-ref.fails.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/unevaluated-const-impl-trait-ref.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/unsafe-auto-trait-impl.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/unsize-although-ambiguous.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/unsize-good.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/upcast-right-substs.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/upcast-wrong-substs.rs (100%) rename tests/ui/traits/{new-solver => next-solver}/upcast-wrong-substs.stderr (100%) rename tests/ui/traits/{new-solver => next-solver}/winnow-specializing-impls.rs (100%) diff --git a/compiler/rustc_borrowck/src/type_check/mod.rs b/compiler/rustc_borrowck/src/type_check/mod.rs index 891fc0bfd020a..98c21693cf0a0 100644 --- a/compiler/rustc_borrowck/src/type_check/mod.rs +++ b/compiler/rustc_borrowck/src/type_check/mod.rs @@ -1006,13 +1006,13 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> { // FIXME(-Znext-solver): A bit dubious that we're only registering // predefined opaques in the typeck root. if infcx.next_trait_solver() && !infcx.tcx.is_typeck_child(body.source.def_id()) { - checker.register_predefined_opaques_in_new_solver(); + checker.register_predefined_opaques_for_next_solver(); } checker } - pub(super) fn register_predefined_opaques_in_new_solver(&mut self) { + pub(super) fn register_predefined_opaques_for_next_solver(&mut self) { // OK to use the identity arguments for each opaque type key, since // we remap opaques from HIR typeck back to their definition params. let opaques: Vec<_> = self diff --git a/compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs b/compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs index 8cdd8a2861296..cafb858794afb 100644 --- a/compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs +++ b/compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs @@ -378,7 +378,7 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> { // // This assert was removed as it did not hold for goals constraining // an inference variable to a recursive alias, e.g. in - // tests/ui/traits/new-solver/overflow/recursive-self-normalization.rs. + // tests/ui/traits/next-solver/overflow/recursive-self-normalization.rs. // // Once we have decided on how to handle trait-system-refactor-initiative#75, // we should re-add an assert here. diff --git a/compiler/rustc_trait_selection/src/solve/search_graph.rs b/compiler/rustc_trait_selection/src/solve/search_graph.rs index 71adebffc1513..2a08b80e02aa9 100644 --- a/compiler/rustc_trait_selection/src/solve/search_graph.rs +++ b/compiler/rustc_trait_selection/src/solve/search_graph.rs @@ -38,7 +38,7 @@ struct StackEntry<'tcx> { /// If we were to use that result when later trying to prove another cycle /// participant, we can end up with unstable query results. /// - /// See tests/ui/new-solver/coinduction/incompleteness-unstable-result.rs for + /// See tests/ui/next-solver/coinduction/incompleteness-unstable-result.rs for /// an example of where this is needed. cycle_participants: FxHashSet>, } @@ -237,7 +237,7 @@ impl<'tcx> SearchGraph<'tcx> { // in unstable results due to incompleteness. // // However, a test for this would be an even more complex version of - // tests/ui/traits/new-solver/coinduction/incompleteness-unstable-result.rs. + // tests/ui/traits/next-solver/coinduction/incompleteness-unstable-result.rs. // I did not bother to write such a test and we have no regression test // for this. It would be good to have such a test :) #[allow(rustc::potential_query_instability)] @@ -248,7 +248,7 @@ impl<'tcx> SearchGraph<'tcx> { // until we reach a fixpoint. It is not enough to simply retry the // `root` goal of this cycle. // - // See tests/ui/traits/new-solver/cycles/fixpoint-rerun-all-cycle-heads.rs + // See tests/ui/traits/next-solver/cycles/fixpoint-rerun-all-cycle-heads.rs // for an example. self.stack[stack_depth].has_been_used = true; return if let Some(result) = self.stack[stack_depth].provisional_result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs index 302b6016e5ea6..152ceeee86995 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs @@ -26,7 +26,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for AscribeUserType<'tcx> { tcx.type_op_ascribe_user_type(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs index f65893088066e..57e649f3e43d0 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs @@ -23,7 +23,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for Eq<'tcx> { tcx.type_op_eq(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs index f9b8ea32d8926..10528696b2d70 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs @@ -50,7 +50,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for ImpliedOutlivesBounds<'tcx> { tcx.implied_outlives_bounds(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs index cd09aaff2d97d..272f1a54f819b 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs @@ -89,7 +89,7 @@ pub trait QueryTypeOp<'tcx>: fmt::Debug + Copy + TypeFoldable> + 't /// make sure to feed it predefined opaque types and the defining anchor /// and that would require duplicating all of the tcx queries. Instead, /// just perform these ops locally. - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result; @@ -149,7 +149,7 @@ where if infcx.next_trait_solver() { return Ok(scrape_region_constraints( infcx, - |ocx| QueryTypeOp::perform_locally_in_new_solver(ocx, self), + |ocx| QueryTypeOp::perform_locally_with_next_solver(ocx, self), "query type op", span, )? diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs index ddf00ecfb65b5..3b33f6e6144a1 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs @@ -25,7 +25,7 @@ where T::type_op_method(tcx, canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs index f2c1243f931b8..07587e3741181 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs @@ -42,7 +42,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for DropckOutlives<'tcx> { tcx.dropck_outlives(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs index 789ef647246e9..e21ede47f6d60 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs @@ -40,7 +40,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for ProvePredicate<'tcx> { tcx.type_op_prove_predicate(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs index 10976d5cd7162..ae11b0825bd0e 100644 --- a/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs +++ b/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs @@ -20,7 +20,7 @@ impl<'tcx> super::QueryTypeOp<'tcx> for Subtype<'tcx> { tcx.type_op_subtype(canonicalized) } - fn perform_locally_in_new_solver( + fn perform_locally_with_next_solver( ocx: &ObligationCtxt<'_, 'tcx>, key: ParamEnvAnd<'tcx, Self>, ) -> Result { diff --git a/tests/ui/traits/new-solver/alias-bound-preference.rs b/tests/ui/traits/next-solver/alias-bound-preference.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-bound-preference.rs rename to tests/ui/traits/next-solver/alias-bound-preference.rs diff --git a/tests/ui/traits/new-solver/alias-bound-unsound.rs b/tests/ui/traits/next-solver/alias-bound-unsound.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-bound-unsound.rs rename to tests/ui/traits/next-solver/alias-bound-unsound.rs diff --git a/tests/ui/traits/new-solver/alias-bound-unsound.stderr b/tests/ui/traits/next-solver/alias-bound-unsound.stderr similarity index 100% rename from tests/ui/traits/new-solver/alias-bound-unsound.stderr rename to tests/ui/traits/next-solver/alias-bound-unsound.stderr diff --git a/tests/ui/traits/new-solver/alias-eq-in-canonical-response.rs b/tests/ui/traits/next-solver/alias-eq-in-canonical-response.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-eq-in-canonical-response.rs rename to tests/ui/traits/next-solver/alias-eq-in-canonical-response.rs diff --git a/tests/ui/traits/new-solver/alias-relate/deeply-nested-no-hang.rs b/tests/ui/traits/next-solver/alias-relate/deeply-nested-no-hang.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-relate/deeply-nested-no-hang.rs rename to tests/ui/traits/next-solver/alias-relate/deeply-nested-no-hang.rs diff --git a/tests/ui/traits/new-solver/alias-relate/opaque-hidden-ty-is-rigid-alias.rs b/tests/ui/traits/next-solver/alias-relate/opaque-hidden-ty-is-rigid-alias.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-relate/opaque-hidden-ty-is-rigid-alias.rs rename to tests/ui/traits/next-solver/alias-relate/opaque-hidden-ty-is-rigid-alias.rs diff --git a/tests/ui/traits/new-solver/alias-sub.rs b/tests/ui/traits/next-solver/alias-sub.rs similarity index 100% rename from tests/ui/traits/new-solver/alias-sub.rs rename to tests/ui/traits/next-solver/alias-sub.rs diff --git a/tests/ui/traits/new-solver/alias_eq_cant_be_furthur_normalized.rs b/tests/ui/traits/next-solver/alias_eq_cant_be_furthur_normalized.rs similarity index 100% rename from tests/ui/traits/new-solver/alias_eq_cant_be_furthur_normalized.rs rename to tests/ui/traits/next-solver/alias_eq_cant_be_furthur_normalized.rs diff --git a/tests/ui/traits/new-solver/alias_eq_dont_use_normalizes_to_if_substs_eq.rs b/tests/ui/traits/next-solver/alias_eq_dont_use_normalizes_to_if_substs_eq.rs similarity index 100% rename from tests/ui/traits/new-solver/alias_eq_dont_use_normalizes_to_if_substs_eq.rs rename to tests/ui/traits/next-solver/alias_eq_dont_use_normalizes_to_if_substs_eq.rs diff --git a/tests/ui/traits/new-solver/alias_eq_simple.rs b/tests/ui/traits/next-solver/alias_eq_simple.rs similarity index 100% rename from tests/ui/traits/new-solver/alias_eq_simple.rs rename to tests/ui/traits/next-solver/alias_eq_simple.rs diff --git a/tests/ui/traits/new-solver/alias_eq_substs_eq_not_intercrate.rs b/tests/ui/traits/next-solver/alias_eq_substs_eq_not_intercrate.rs similarity index 100% rename from tests/ui/traits/new-solver/alias_eq_substs_eq_not_intercrate.rs rename to tests/ui/traits/next-solver/alias_eq_substs_eq_not_intercrate.rs diff --git a/tests/ui/traits/new-solver/alias_eq_substs_eq_not_intercrate.stderr b/tests/ui/traits/next-solver/alias_eq_substs_eq_not_intercrate.stderr similarity index 100% rename from tests/ui/traits/new-solver/alias_eq_substs_eq_not_intercrate.stderr rename to tests/ui/traits/next-solver/alias_eq_substs_eq_not_intercrate.stderr diff --git a/tests/ui/traits/new-solver/array-default.rs b/tests/ui/traits/next-solver/array-default.rs similarity index 100% rename from tests/ui/traits/new-solver/array-default.rs rename to tests/ui/traits/next-solver/array-default.rs diff --git a/tests/ui/traits/new-solver/assembly/assemble-normalizing-self-ty-impl-ambiguity.rs b/tests/ui/traits/next-solver/assembly/assemble-normalizing-self-ty-impl-ambiguity.rs similarity index 100% rename from tests/ui/traits/new-solver/assembly/assemble-normalizing-self-ty-impl-ambiguity.rs rename to tests/ui/traits/next-solver/assembly/assemble-normalizing-self-ty-impl-ambiguity.rs diff --git a/tests/ui/traits/new-solver/assembly/runaway-impl-candidate-selection.rs b/tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.rs similarity index 100% rename from tests/ui/traits/new-solver/assembly/runaway-impl-candidate-selection.rs rename to tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.rs diff --git a/tests/ui/traits/new-solver/assembly/runaway-impl-candidate-selection.stderr b/tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.stderr similarity index 100% rename from tests/ui/traits/new-solver/assembly/runaway-impl-candidate-selection.stderr rename to tests/ui/traits/next-solver/assembly/runaway-impl-candidate-selection.stderr diff --git a/tests/ui/traits/new-solver/async.fail.stderr b/tests/ui/traits/next-solver/async.fail.stderr similarity index 100% rename from tests/ui/traits/new-solver/async.fail.stderr rename to tests/ui/traits/next-solver/async.fail.stderr diff --git a/tests/ui/traits/new-solver/async.rs b/tests/ui/traits/next-solver/async.rs similarity index 100% rename from tests/ui/traits/new-solver/async.rs rename to tests/ui/traits/next-solver/async.rs diff --git a/tests/ui/traits/new-solver/auto-with-drop_tracking_mir.fail.stderr b/tests/ui/traits/next-solver/auto-with-drop_tracking_mir.fail.stderr similarity index 100% rename from tests/ui/traits/new-solver/auto-with-drop_tracking_mir.fail.stderr rename to tests/ui/traits/next-solver/auto-with-drop_tracking_mir.fail.stderr diff --git a/tests/ui/traits/new-solver/auto-with-drop_tracking_mir.rs b/tests/ui/traits/next-solver/auto-with-drop_tracking_mir.rs similarity index 100% rename from tests/ui/traits/new-solver/auto-with-drop_tracking_mir.rs rename to tests/ui/traits/next-solver/auto-with-drop_tracking_mir.rs diff --git a/tests/ui/traits/new-solver/borrowck-error.rs b/tests/ui/traits/next-solver/borrowck-error.rs similarity index 100% rename from tests/ui/traits/new-solver/borrowck-error.rs rename to tests/ui/traits/next-solver/borrowck-error.rs diff --git a/tests/ui/traits/new-solver/borrowck-error.stderr b/tests/ui/traits/next-solver/borrowck-error.stderr similarity index 100% rename from tests/ui/traits/new-solver/borrowck-error.stderr rename to tests/ui/traits/next-solver/borrowck-error.stderr diff --git a/tests/ui/traits/new-solver/builtin-fn-must-return-sized.rs b/tests/ui/traits/next-solver/builtin-fn-must-return-sized.rs similarity index 100% rename from tests/ui/traits/new-solver/builtin-fn-must-return-sized.rs rename to tests/ui/traits/next-solver/builtin-fn-must-return-sized.rs diff --git a/tests/ui/traits/new-solver/builtin-fn-must-return-sized.stderr b/tests/ui/traits/next-solver/builtin-fn-must-return-sized.stderr similarity index 100% rename from tests/ui/traits/new-solver/builtin-fn-must-return-sized.stderr rename to tests/ui/traits/next-solver/builtin-fn-must-return-sized.stderr diff --git a/tests/ui/traits/new-solver/canonical-int-var-eq-in-response.rs b/tests/ui/traits/next-solver/canonical-int-var-eq-in-response.rs similarity index 100% rename from tests/ui/traits/new-solver/canonical-int-var-eq-in-response.rs rename to tests/ui/traits/next-solver/canonical-int-var-eq-in-response.rs diff --git a/tests/ui/traits/new-solver/canonical-ty-var-eq-in-response.rs b/tests/ui/traits/next-solver/canonical-ty-var-eq-in-response.rs similarity index 100% rename from tests/ui/traits/new-solver/canonical-ty-var-eq-in-response.rs rename to tests/ui/traits/next-solver/canonical-ty-var-eq-in-response.rs diff --git a/tests/ui/traits/new-solver/canonicalize-effect-var.rs b/tests/ui/traits/next-solver/canonicalize-effect-var.rs similarity index 100% rename from tests/ui/traits/new-solver/canonicalize-effect-var.rs rename to tests/ui/traits/next-solver/canonicalize-effect-var.rs diff --git a/tests/ui/traits/new-solver/cast-checks-handling-projections.rs b/tests/ui/traits/next-solver/cast-checks-handling-projections.rs similarity index 100% rename from tests/ui/traits/new-solver/cast-checks-handling-projections.rs rename to tests/ui/traits/next-solver/cast-checks-handling-projections.rs diff --git a/tests/ui/traits/new-solver/closure-inference-guidance.rs b/tests/ui/traits/next-solver/closure-inference-guidance.rs similarity index 100% rename from tests/ui/traits/new-solver/closure-inference-guidance.rs rename to tests/ui/traits/next-solver/closure-inference-guidance.rs diff --git a/tests/ui/traits/new-solver/closure-substs-ambiguity.rs b/tests/ui/traits/next-solver/closure-substs-ambiguity.rs similarity index 100% rename from tests/ui/traits/new-solver/closure-substs-ambiguity.rs rename to tests/ui/traits/next-solver/closure-substs-ambiguity.rs diff --git a/tests/ui/traits/new-solver/coherence/issue-102048.rs b/tests/ui/traits/next-solver/coherence/issue-102048.rs similarity index 100% rename from tests/ui/traits/new-solver/coherence/issue-102048.rs rename to tests/ui/traits/next-solver/coherence/issue-102048.rs diff --git a/tests/ui/traits/new-solver/coherence/issue-102048.stderr b/tests/ui/traits/next-solver/coherence/issue-102048.stderr similarity index 100% rename from tests/ui/traits/new-solver/coherence/issue-102048.stderr rename to tests/ui/traits/next-solver/coherence/issue-102048.stderr diff --git a/tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-norm-overflow.rs b/tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-norm-overflow.rs similarity index 100% rename from tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-norm-overflow.rs rename to tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-norm-overflow.rs diff --git a/tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-norm-overflow.stderr b/tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-norm-overflow.stderr similarity index 100% rename from tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-norm-overflow.stderr rename to tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-norm-overflow.stderr diff --git a/tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-1.rs b/tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-1.rs similarity index 100% rename from tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-1.rs rename to tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-1.rs diff --git a/tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-2.rs b/tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-2.rs similarity index 100% rename from tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-2.rs rename to tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-2.rs diff --git a/tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-3.rs b/tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-3.rs similarity index 100% rename from tests/ui/traits/new-solver/coherence/trait_ref_is_knowable-normalization-3.rs rename to tests/ui/traits/next-solver/coherence/trait_ref_is_knowable-normalization-3.rs diff --git a/tests/ui/traits/new-solver/const-param-placeholder.fail.stderr b/tests/ui/traits/next-solver/const-param-placeholder.fail.stderr similarity index 100% rename from tests/ui/traits/new-solver/const-param-placeholder.fail.stderr rename to tests/ui/traits/next-solver/const-param-placeholder.fail.stderr diff --git a/tests/ui/traits/new-solver/const-param-placeholder.rs b/tests/ui/traits/next-solver/const-param-placeholder.rs similarity index 100% rename from tests/ui/traits/new-solver/const-param-placeholder.rs rename to tests/ui/traits/next-solver/const-param-placeholder.rs diff --git a/tests/ui/traits/new-solver/coroutine.fail.stderr b/tests/ui/traits/next-solver/coroutine.fail.stderr similarity index 100% rename from tests/ui/traits/new-solver/coroutine.fail.stderr rename to tests/ui/traits/next-solver/coroutine.fail.stderr diff --git a/tests/ui/traits/new-solver/coroutine.rs b/tests/ui/traits/next-solver/coroutine.rs similarity index 100% rename from tests/ui/traits/new-solver/coroutine.rs rename to tests/ui/traits/next-solver/coroutine.rs diff --git a/tests/ui/traits/new-solver/cycles/coinduction/fixpoint-exponential-growth.rs b/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/coinduction/fixpoint-exponential-growth.rs rename to tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.rs diff --git a/tests/ui/traits/new-solver/cycles/coinduction/fixpoint-exponential-growth.stderr b/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/coinduction/fixpoint-exponential-growth.stderr rename to tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.stderr diff --git a/tests/ui/traits/new-solver/cycles/coinduction/incompleteness-unstable-result.rs b/tests/ui/traits/next-solver/cycles/coinduction/incompleteness-unstable-result.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/coinduction/incompleteness-unstable-result.rs rename to tests/ui/traits/next-solver/cycles/coinduction/incompleteness-unstable-result.rs diff --git a/tests/ui/traits/new-solver/cycles/coinduction/incompleteness-unstable-result.stderr b/tests/ui/traits/next-solver/cycles/coinduction/incompleteness-unstable-result.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/coinduction/incompleteness-unstable-result.stderr rename to tests/ui/traits/next-solver/cycles/coinduction/incompleteness-unstable-result.stderr diff --git a/tests/ui/traits/new-solver/cycles/double-cycle-inductive-coinductive.rs b/tests/ui/traits/next-solver/cycles/double-cycle-inductive-coinductive.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/double-cycle-inductive-coinductive.rs rename to tests/ui/traits/next-solver/cycles/double-cycle-inductive-coinductive.rs diff --git a/tests/ui/traits/new-solver/cycles/double-cycle-inductive-coinductive.stderr b/tests/ui/traits/next-solver/cycles/double-cycle-inductive-coinductive.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/double-cycle-inductive-coinductive.stderr rename to tests/ui/traits/next-solver/cycles/double-cycle-inductive-coinductive.stderr diff --git a/tests/ui/traits/new-solver/cycles/fixpoint-rerun-all-cycle-heads.rs b/tests/ui/traits/next-solver/cycles/fixpoint-rerun-all-cycle-heads.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/fixpoint-rerun-all-cycle-heads.rs rename to tests/ui/traits/next-solver/cycles/fixpoint-rerun-all-cycle-heads.rs diff --git a/tests/ui/traits/new-solver/cycles/fixpoint-rerun-all-cycle-heads.stderr b/tests/ui/traits/next-solver/cycles/fixpoint-rerun-all-cycle-heads.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/fixpoint-rerun-all-cycle-heads.stderr rename to tests/ui/traits/next-solver/cycles/fixpoint-rerun-all-cycle-heads.stderr diff --git a/tests/ui/traits/new-solver/cycles/inductive-cycle-but-err.rs b/tests/ui/traits/next-solver/cycles/inductive-cycle-but-err.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-cycle-but-err.rs rename to tests/ui/traits/next-solver/cycles/inductive-cycle-but-err.rs diff --git a/tests/ui/traits/new-solver/cycles/inductive-cycle-but-err.stderr b/tests/ui/traits/next-solver/cycles/inductive-cycle-but-err.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-cycle-but-err.stderr rename to tests/ui/traits/next-solver/cycles/inductive-cycle-but-err.stderr diff --git a/tests/ui/traits/new-solver/cycles/inductive-cycle-but-ok.rs b/tests/ui/traits/next-solver/cycles/inductive-cycle-but-ok.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-cycle-but-ok.rs rename to tests/ui/traits/next-solver/cycles/inductive-cycle-but-ok.rs diff --git a/tests/ui/traits/new-solver/cycles/inductive-cycle-discarded-coinductive-constraints.rs b/tests/ui/traits/next-solver/cycles/inductive-cycle-discarded-coinductive-constraints.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-cycle-discarded-coinductive-constraints.rs rename to tests/ui/traits/next-solver/cycles/inductive-cycle-discarded-coinductive-constraints.rs diff --git a/tests/ui/traits/new-solver/cycles/inductive-fixpoint-hang.rs b/tests/ui/traits/next-solver/cycles/inductive-fixpoint-hang.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-fixpoint-hang.rs rename to tests/ui/traits/next-solver/cycles/inductive-fixpoint-hang.rs diff --git a/tests/ui/traits/new-solver/cycles/inductive-fixpoint-hang.stderr b/tests/ui/traits/next-solver/cycles/inductive-fixpoint-hang.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-fixpoint-hang.stderr rename to tests/ui/traits/next-solver/cycles/inductive-fixpoint-hang.stderr diff --git a/tests/ui/traits/new-solver/cycles/inductive-not-on-stack.rs b/tests/ui/traits/next-solver/cycles/inductive-not-on-stack.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-not-on-stack.rs rename to tests/ui/traits/next-solver/cycles/inductive-not-on-stack.rs diff --git a/tests/ui/traits/new-solver/cycles/inductive-not-on-stack.stderr b/tests/ui/traits/next-solver/cycles/inductive-not-on-stack.stderr similarity index 100% rename from tests/ui/traits/new-solver/cycles/inductive-not-on-stack.stderr rename to tests/ui/traits/next-solver/cycles/inductive-not-on-stack.stderr diff --git a/tests/ui/traits/new-solver/cycles/leak-check-coinductive-cycle.rs b/tests/ui/traits/next-solver/cycles/leak-check-coinductive-cycle.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/leak-check-coinductive-cycle.rs rename to tests/ui/traits/next-solver/cycles/leak-check-coinductive-cycle.rs diff --git a/tests/ui/traits/new-solver/cycles/provisional-result-done.rs b/tests/ui/traits/next-solver/cycles/provisional-result-done.rs similarity index 100% rename from tests/ui/traits/new-solver/cycles/provisional-result-done.rs rename to tests/ui/traits/next-solver/cycles/provisional-result-done.rs diff --git a/tests/ui/traits/new-solver/deduce-closure-signature-after-normalization.rs b/tests/ui/traits/next-solver/deduce-closure-signature-after-normalization.rs similarity index 100% rename from tests/ui/traits/new-solver/deduce-closure-signature-after-normalization.rs rename to tests/ui/traits/next-solver/deduce-closure-signature-after-normalization.rs diff --git a/tests/ui/traits/new-solver/deduce-ty-from-object.rs b/tests/ui/traits/next-solver/deduce-ty-from-object.rs similarity index 100% rename from tests/ui/traits/new-solver/deduce-ty-from-object.rs rename to tests/ui/traits/next-solver/deduce-ty-from-object.rs diff --git a/tests/ui/traits/new-solver/dedup-regions.rs b/tests/ui/traits/next-solver/dedup-regions.rs similarity index 100% rename from tests/ui/traits/new-solver/dedup-regions.rs rename to tests/ui/traits/next-solver/dedup-regions.rs diff --git a/tests/ui/traits/new-solver/destruct.rs b/tests/ui/traits/next-solver/destruct.rs similarity index 100% rename from tests/ui/traits/new-solver/destruct.rs rename to tests/ui/traits/next-solver/destruct.rs diff --git a/tests/ui/traits/new-solver/dont-coerce-infer-to-dyn.rs b/tests/ui/traits/next-solver/dont-coerce-infer-to-dyn.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-coerce-infer-to-dyn.rs rename to tests/ui/traits/next-solver/dont-coerce-infer-to-dyn.rs diff --git a/tests/ui/traits/new-solver/dont-elaborate-for-projections.rs b/tests/ui/traits/next-solver/dont-elaborate-for-projections.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-elaborate-for-projections.rs rename to tests/ui/traits/next-solver/dont-elaborate-for-projections.rs diff --git a/tests/ui/traits/new-solver/dont-ice-on-assoc-projection.rs b/tests/ui/traits/next-solver/dont-ice-on-assoc-projection.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-ice-on-assoc-projection.rs rename to tests/ui/traits/next-solver/dont-ice-on-assoc-projection.rs diff --git a/tests/ui/traits/new-solver/dont-ice-on-assoc-projection.stderr b/tests/ui/traits/next-solver/dont-ice-on-assoc-projection.stderr similarity index 100% rename from tests/ui/traits/new-solver/dont-ice-on-assoc-projection.stderr rename to tests/ui/traits/next-solver/dont-ice-on-assoc-projection.stderr diff --git a/tests/ui/traits/new-solver/dont-loop-fulfill-on-region-constraints.rs b/tests/ui/traits/next-solver/dont-loop-fulfill-on-region-constraints.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-loop-fulfill-on-region-constraints.rs rename to tests/ui/traits/next-solver/dont-loop-fulfill-on-region-constraints.rs diff --git a/tests/ui/traits/new-solver/dont-normalize-proj-with-error.rs b/tests/ui/traits/next-solver/dont-normalize-proj-with-error.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-normalize-proj-with-error.rs rename to tests/ui/traits/next-solver/dont-normalize-proj-with-error.rs diff --git a/tests/ui/traits/new-solver/dont-normalize-proj-with-error.stderr b/tests/ui/traits/next-solver/dont-normalize-proj-with-error.stderr similarity index 100% rename from tests/ui/traits/new-solver/dont-normalize-proj-with-error.stderr rename to tests/ui/traits/next-solver/dont-normalize-proj-with-error.stderr diff --git a/tests/ui/traits/new-solver/dont-remap-tait-substs.rs b/tests/ui/traits/next-solver/dont-remap-tait-substs.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-remap-tait-substs.rs rename to tests/ui/traits/next-solver/dont-remap-tait-substs.rs diff --git a/tests/ui/traits/new-solver/dont-type_of-tait-in-defining-scope.not_send.stderr b/tests/ui/traits/next-solver/dont-type_of-tait-in-defining-scope.not_send.stderr similarity index 100% rename from tests/ui/traits/new-solver/dont-type_of-tait-in-defining-scope.not_send.stderr rename to tests/ui/traits/next-solver/dont-type_of-tait-in-defining-scope.not_send.stderr diff --git a/tests/ui/traits/new-solver/dont-type_of-tait-in-defining-scope.rs b/tests/ui/traits/next-solver/dont-type_of-tait-in-defining-scope.rs similarity index 100% rename from tests/ui/traits/new-solver/dont-type_of-tait-in-defining-scope.rs rename to tests/ui/traits/next-solver/dont-type_of-tait-in-defining-scope.rs diff --git a/tests/ui/traits/new-solver/dyn-any-dont-prefer-impl.rs b/tests/ui/traits/next-solver/dyn-any-dont-prefer-impl.rs similarity index 100% rename from tests/ui/traits/new-solver/dyn-any-dont-prefer-impl.rs rename to tests/ui/traits/next-solver/dyn-any-dont-prefer-impl.rs diff --git a/tests/ui/traits/new-solver/elaborate-item-bounds.rs b/tests/ui/traits/next-solver/elaborate-item-bounds.rs similarity index 100% rename from tests/ui/traits/new-solver/elaborate-item-bounds.rs rename to tests/ui/traits/next-solver/elaborate-item-bounds.rs diff --git a/tests/ui/traits/new-solver/equating-projection-cyclically.rs b/tests/ui/traits/next-solver/equating-projection-cyclically.rs similarity index 100% rename from tests/ui/traits/new-solver/equating-projection-cyclically.rs rename to tests/ui/traits/next-solver/equating-projection-cyclically.rs diff --git a/tests/ui/traits/new-solver/escaping-bound-vars-in-writeback-normalization.rs b/tests/ui/traits/next-solver/escaping-bound-vars-in-writeback-normalization.rs similarity index 100% rename from tests/ui/traits/new-solver/escaping-bound-vars-in-writeback-normalization.rs rename to tests/ui/traits/next-solver/escaping-bound-vars-in-writeback-normalization.rs diff --git a/tests/ui/traits/new-solver/float-canonical.rs b/tests/ui/traits/next-solver/float-canonical.rs similarity index 100% rename from tests/ui/traits/new-solver/float-canonical.rs rename to tests/ui/traits/next-solver/float-canonical.rs diff --git a/tests/ui/traits/new-solver/fn-trait-closure.rs b/tests/ui/traits/next-solver/fn-trait-closure.rs similarity index 100% rename from tests/ui/traits/new-solver/fn-trait-closure.rs rename to tests/ui/traits/next-solver/fn-trait-closure.rs diff --git a/tests/ui/traits/new-solver/fn-trait.rs b/tests/ui/traits/next-solver/fn-trait.rs similarity index 100% rename from tests/ui/traits/new-solver/fn-trait.rs rename to tests/ui/traits/next-solver/fn-trait.rs diff --git a/tests/ui/traits/new-solver/fn-trait.stderr b/tests/ui/traits/next-solver/fn-trait.stderr similarity index 100% rename from tests/ui/traits/new-solver/fn-trait.stderr rename to tests/ui/traits/next-solver/fn-trait.stderr diff --git a/tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-1.rs b/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-1.rs similarity index 100% rename from tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-1.rs rename to tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-1.rs diff --git a/tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-2.rs b/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.rs similarity index 100% rename from tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-2.rs rename to tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.rs diff --git a/tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-2.stderr b/tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.stderr similarity index 100% rename from tests/ui/traits/new-solver/generalize/generalize-proj-new-universe-index-2.stderr rename to tests/ui/traits/next-solver/generalize/generalize-proj-new-universe-index-2.stderr diff --git a/tests/ui/traits/new-solver/generalize/occurs-check-nested-alias.next.stderr b/tests/ui/traits/next-solver/generalize/occurs-check-nested-alias.next.stderr similarity index 100% rename from tests/ui/traits/new-solver/generalize/occurs-check-nested-alias.next.stderr rename to tests/ui/traits/next-solver/generalize/occurs-check-nested-alias.next.stderr diff --git a/tests/ui/traits/new-solver/generalize/occurs-check-nested-alias.rs b/tests/ui/traits/next-solver/generalize/occurs-check-nested-alias.rs similarity index 100% rename from tests/ui/traits/new-solver/generalize/occurs-check-nested-alias.rs rename to tests/ui/traits/next-solver/generalize/occurs-check-nested-alias.rs diff --git a/tests/ui/traits/new-solver/higher-ranked-dyn-bounds.rs b/tests/ui/traits/next-solver/higher-ranked-dyn-bounds.rs similarity index 100% rename from tests/ui/traits/new-solver/higher-ranked-dyn-bounds.rs rename to tests/ui/traits/next-solver/higher-ranked-dyn-bounds.rs diff --git a/tests/ui/traits/new-solver/int-var-alias-eq.rs b/tests/ui/traits/next-solver/int-var-alias-eq.rs similarity index 100% rename from tests/ui/traits/new-solver/int-var-alias-eq.rs rename to tests/ui/traits/next-solver/int-var-alias-eq.rs diff --git a/tests/ui/traits/new-solver/int-var-is-send.rs b/tests/ui/traits/next-solver/int-var-is-send.rs similarity index 100% rename from tests/ui/traits/new-solver/int-var-is-send.rs rename to tests/ui/traits/next-solver/int-var-is-send.rs diff --git a/tests/ui/traits/new-solver/iter-filter-projection.rs b/tests/ui/traits/next-solver/iter-filter-projection.rs similarity index 100% rename from tests/ui/traits/new-solver/iter-filter-projection.rs rename to tests/ui/traits/next-solver/iter-filter-projection.rs diff --git a/tests/ui/traits/new-solver/lazy-nested-obligations-1.rs b/tests/ui/traits/next-solver/lazy-nested-obligations-1.rs similarity index 100% rename from tests/ui/traits/new-solver/lazy-nested-obligations-1.rs rename to tests/ui/traits/next-solver/lazy-nested-obligations-1.rs diff --git a/tests/ui/traits/new-solver/lazy-nested-obligations-2.rs b/tests/ui/traits/next-solver/lazy-nested-obligations-2.rs similarity index 100% rename from tests/ui/traits/new-solver/lazy-nested-obligations-2.rs rename to tests/ui/traits/next-solver/lazy-nested-obligations-2.rs diff --git a/tests/ui/traits/new-solver/lazy-nested-obligations-3.rs b/tests/ui/traits/next-solver/lazy-nested-obligations-3.rs similarity index 100% rename from tests/ui/traits/new-solver/lazy-nested-obligations-3.rs rename to tests/ui/traits/next-solver/lazy-nested-obligations-3.rs diff --git a/tests/ui/traits/new-solver/member-constraints-in-root-universe.rs b/tests/ui/traits/next-solver/member-constraints-in-root-universe.rs similarity index 100% rename from tests/ui/traits/new-solver/member-constraints-in-root-universe.rs rename to tests/ui/traits/next-solver/member-constraints-in-root-universe.rs diff --git a/tests/ui/traits/new-solver/more-object-bound.rs b/tests/ui/traits/next-solver/more-object-bound.rs similarity index 100% rename from tests/ui/traits/new-solver/more-object-bound.rs rename to tests/ui/traits/next-solver/more-object-bound.rs diff --git a/tests/ui/traits/new-solver/more-object-bound.stderr b/tests/ui/traits/next-solver/more-object-bound.stderr similarity index 100% rename from tests/ui/traits/new-solver/more-object-bound.stderr rename to tests/ui/traits/next-solver/more-object-bound.stderr diff --git a/tests/ui/traits/new-solver/negative-coherence-bounds.rs b/tests/ui/traits/next-solver/negative-coherence-bounds.rs similarity index 100% rename from tests/ui/traits/new-solver/negative-coherence-bounds.rs rename to tests/ui/traits/next-solver/negative-coherence-bounds.rs diff --git a/tests/ui/traits/new-solver/negative-coherence-bounds.stderr b/tests/ui/traits/next-solver/negative-coherence-bounds.stderr similarity index 100% rename from tests/ui/traits/new-solver/negative-coherence-bounds.stderr rename to tests/ui/traits/next-solver/negative-coherence-bounds.stderr diff --git a/tests/ui/traits/new-solver/nested-alias-bound.rs b/tests/ui/traits/next-solver/nested-alias-bound.rs similarity index 100% rename from tests/ui/traits/new-solver/nested-alias-bound.rs rename to tests/ui/traits/next-solver/nested-alias-bound.rs diff --git a/tests/ui/traits/new-solver/nested-obligations-with-bound-vars-gat.rs b/tests/ui/traits/next-solver/nested-obligations-with-bound-vars-gat.rs similarity index 100% rename from tests/ui/traits/new-solver/nested-obligations-with-bound-vars-gat.rs rename to tests/ui/traits/next-solver/nested-obligations-with-bound-vars-gat.rs diff --git a/tests/ui/traits/new-solver/normalize-async-closure-in-trait.rs b/tests/ui/traits/next-solver/normalize-async-closure-in-trait.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-async-closure-in-trait.rs rename to tests/ui/traits/next-solver/normalize-async-closure-in-trait.rs diff --git a/tests/ui/traits/new-solver/normalize-param-env-1.rs b/tests/ui/traits/next-solver/normalize-param-env-1.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-param-env-1.rs rename to tests/ui/traits/next-solver/normalize-param-env-1.rs diff --git a/tests/ui/traits/new-solver/normalize-param-env-2.rs b/tests/ui/traits/next-solver/normalize-param-env-2.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-param-env-2.rs rename to tests/ui/traits/next-solver/normalize-param-env-2.rs diff --git a/tests/ui/traits/new-solver/normalize-param-env-3.rs b/tests/ui/traits/next-solver/normalize-param-env-3.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-param-env-3.rs rename to tests/ui/traits/next-solver/normalize-param-env-3.rs diff --git a/tests/ui/traits/new-solver/normalize-rcvr-for-inherent.rs b/tests/ui/traits/next-solver/normalize-rcvr-for-inherent.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-rcvr-for-inherent.rs rename to tests/ui/traits/next-solver/normalize-rcvr-for-inherent.rs diff --git a/tests/ui/traits/new-solver/normalize-unsize-rhs.rs b/tests/ui/traits/next-solver/normalize-unsize-rhs.rs similarity index 100% rename from tests/ui/traits/new-solver/normalize-unsize-rhs.rs rename to tests/ui/traits/next-solver/normalize-unsize-rhs.rs diff --git a/tests/ui/traits/new-solver/normalized-const-built-in-op.rs b/tests/ui/traits/next-solver/normalized-const-built-in-op.rs similarity index 100% rename from tests/ui/traits/new-solver/normalized-const-built-in-op.rs rename to tests/ui/traits/next-solver/normalized-const-built-in-op.rs diff --git a/tests/ui/traits/new-solver/normalizes_to_ignores_unnormalizable_candidate.rs b/tests/ui/traits/next-solver/normalizes_to_ignores_unnormalizable_candidate.rs similarity index 100% rename from tests/ui/traits/new-solver/normalizes_to_ignores_unnormalizable_candidate.rs rename to tests/ui/traits/next-solver/normalizes_to_ignores_unnormalizable_candidate.rs diff --git a/tests/ui/traits/new-solver/normalizes_to_ignores_unnormalizable_candidate.self_infer.stderr b/tests/ui/traits/next-solver/normalizes_to_ignores_unnormalizable_candidate.self_infer.stderr similarity index 100% rename from tests/ui/traits/new-solver/normalizes_to_ignores_unnormalizable_candidate.self_infer.stderr rename to tests/ui/traits/next-solver/normalizes_to_ignores_unnormalizable_candidate.self_infer.stderr diff --git a/tests/ui/traits/new-solver/object-soundness-requires-generalization.rs b/tests/ui/traits/next-solver/object-soundness-requires-generalization.rs similarity index 100% rename from tests/ui/traits/new-solver/object-soundness-requires-generalization.rs rename to tests/ui/traits/next-solver/object-soundness-requires-generalization.rs diff --git a/tests/ui/traits/new-solver/object-unsafety.rs b/tests/ui/traits/next-solver/object-unsafety.rs similarity index 100% rename from tests/ui/traits/new-solver/object-unsafety.rs rename to tests/ui/traits/next-solver/object-unsafety.rs diff --git a/tests/ui/traits/new-solver/object-unsafety.stderr b/tests/ui/traits/next-solver/object-unsafety.stderr similarity index 100% rename from tests/ui/traits/new-solver/object-unsafety.stderr rename to tests/ui/traits/next-solver/object-unsafety.stderr diff --git a/tests/ui/traits/new-solver/opportunistic-region-resolve.rs b/tests/ui/traits/next-solver/opportunistic-region-resolve.rs similarity index 100% rename from tests/ui/traits/new-solver/opportunistic-region-resolve.rs rename to tests/ui/traits/next-solver/opportunistic-region-resolve.rs diff --git a/tests/ui/traits/new-solver/overflow/exponential-trait-goals.rs b/tests/ui/traits/next-solver/overflow/exponential-trait-goals.rs similarity index 100% rename from tests/ui/traits/new-solver/overflow/exponential-trait-goals.rs rename to tests/ui/traits/next-solver/overflow/exponential-trait-goals.rs diff --git a/tests/ui/traits/new-solver/overflow/exponential-trait-goals.stderr b/tests/ui/traits/next-solver/overflow/exponential-trait-goals.stderr similarity index 100% rename from tests/ui/traits/new-solver/overflow/exponential-trait-goals.stderr rename to tests/ui/traits/next-solver/overflow/exponential-trait-goals.stderr diff --git a/tests/ui/traits/new-solver/overflow/global-cache.rs b/tests/ui/traits/next-solver/overflow/global-cache.rs similarity index 100% rename from tests/ui/traits/new-solver/overflow/global-cache.rs rename to tests/ui/traits/next-solver/overflow/global-cache.rs diff --git a/tests/ui/traits/new-solver/overflow/global-cache.stderr b/tests/ui/traits/next-solver/overflow/global-cache.stderr similarity index 100% rename from tests/ui/traits/new-solver/overflow/global-cache.stderr rename to tests/ui/traits/next-solver/overflow/global-cache.stderr diff --git a/tests/ui/traits/new-solver/overflow/recursion-limit-zero-issue-115351.rs b/tests/ui/traits/next-solver/overflow/recursion-limit-zero-issue-115351.rs similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursion-limit-zero-issue-115351.rs rename to tests/ui/traits/next-solver/overflow/recursion-limit-zero-issue-115351.rs diff --git a/tests/ui/traits/new-solver/overflow/recursion-limit-zero-issue-115351.stderr b/tests/ui/traits/next-solver/overflow/recursion-limit-zero-issue-115351.stderr similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursion-limit-zero-issue-115351.stderr rename to tests/ui/traits/next-solver/overflow/recursion-limit-zero-issue-115351.stderr diff --git a/tests/ui/traits/new-solver/overflow/recursive-self-normalization-2.rs b/tests/ui/traits/next-solver/overflow/recursive-self-normalization-2.rs similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursive-self-normalization-2.rs rename to tests/ui/traits/next-solver/overflow/recursive-self-normalization-2.rs diff --git a/tests/ui/traits/new-solver/overflow/recursive-self-normalization-2.stderr b/tests/ui/traits/next-solver/overflow/recursive-self-normalization-2.stderr similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursive-self-normalization-2.stderr rename to tests/ui/traits/next-solver/overflow/recursive-self-normalization-2.stderr diff --git a/tests/ui/traits/new-solver/overflow/recursive-self-normalization.rs b/tests/ui/traits/next-solver/overflow/recursive-self-normalization.rs similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursive-self-normalization.rs rename to tests/ui/traits/next-solver/overflow/recursive-self-normalization.rs diff --git a/tests/ui/traits/new-solver/overflow/recursive-self-normalization.stderr b/tests/ui/traits/next-solver/overflow/recursive-self-normalization.stderr similarity index 100% rename from tests/ui/traits/new-solver/overflow/recursive-self-normalization.stderr rename to tests/ui/traits/next-solver/overflow/recursive-self-normalization.stderr diff --git a/tests/ui/traits/new-solver/param-candidate-doesnt-shadow-project.rs b/tests/ui/traits/next-solver/param-candidate-doesnt-shadow-project.rs similarity index 100% rename from tests/ui/traits/new-solver/param-candidate-doesnt-shadow-project.rs rename to tests/ui/traits/next-solver/param-candidate-doesnt-shadow-project.rs diff --git a/tests/ui/traits/new-solver/param-discr-kind.rs b/tests/ui/traits/next-solver/param-discr-kind.rs similarity index 100% rename from tests/ui/traits/new-solver/param-discr-kind.rs rename to tests/ui/traits/next-solver/param-discr-kind.rs diff --git a/tests/ui/traits/new-solver/pointee.rs b/tests/ui/traits/next-solver/pointee.rs similarity index 100% rename from tests/ui/traits/new-solver/pointee.rs rename to tests/ui/traits/next-solver/pointee.rs diff --git a/tests/ui/traits/new-solver/pointer-like.rs b/tests/ui/traits/next-solver/pointer-like.rs similarity index 100% rename from tests/ui/traits/new-solver/pointer-like.rs rename to tests/ui/traits/next-solver/pointer-like.rs diff --git a/tests/ui/traits/new-solver/pointer-like.stderr b/tests/ui/traits/next-solver/pointer-like.stderr similarity index 100% rename from tests/ui/traits/new-solver/pointer-like.stderr rename to tests/ui/traits/next-solver/pointer-like.stderr diff --git a/tests/ui/traits/new-solver/prefer-candidate-no-constraints.rs b/tests/ui/traits/next-solver/prefer-candidate-no-constraints.rs similarity index 100% rename from tests/ui/traits/new-solver/prefer-candidate-no-constraints.rs rename to tests/ui/traits/next-solver/prefer-candidate-no-constraints.rs diff --git a/tests/ui/traits/new-solver/prefer-param-env-on-ambiguity.rs b/tests/ui/traits/next-solver/prefer-param-env-on-ambiguity.rs similarity index 100% rename from tests/ui/traits/new-solver/prefer-param-env-on-ambiguity.rs rename to tests/ui/traits/next-solver/prefer-param-env-on-ambiguity.rs diff --git a/tests/ui/traits/new-solver/projection-discr-kind.rs b/tests/ui/traits/next-solver/projection-discr-kind.rs similarity index 100% rename from tests/ui/traits/new-solver/projection-discr-kind.rs rename to tests/ui/traits/next-solver/projection-discr-kind.rs diff --git a/tests/ui/traits/new-solver/projection-discr-kind.stderr b/tests/ui/traits/next-solver/projection-discr-kind.stderr similarity index 100% rename from tests/ui/traits/new-solver/projection-discr-kind.stderr rename to tests/ui/traits/next-solver/projection-discr-kind.stderr diff --git a/tests/ui/traits/new-solver/slice-match-byte-lit.rs b/tests/ui/traits/next-solver/slice-match-byte-lit.rs similarity index 100% rename from tests/ui/traits/new-solver/slice-match-byte-lit.rs rename to tests/ui/traits/next-solver/slice-match-byte-lit.rs diff --git a/tests/ui/traits/new-solver/specialization-transmute.rs b/tests/ui/traits/next-solver/specialization-transmute.rs similarity index 100% rename from tests/ui/traits/new-solver/specialization-transmute.rs rename to tests/ui/traits/next-solver/specialization-transmute.rs diff --git a/tests/ui/traits/new-solver/specialization-transmute.stderr b/tests/ui/traits/next-solver/specialization-transmute.stderr similarity index 100% rename from tests/ui/traits/new-solver/specialization-transmute.stderr rename to tests/ui/traits/next-solver/specialization-transmute.stderr diff --git a/tests/ui/traits/new-solver/specialization-unconstrained.rs b/tests/ui/traits/next-solver/specialization-unconstrained.rs similarity index 100% rename from tests/ui/traits/new-solver/specialization-unconstrained.rs rename to tests/ui/traits/next-solver/specialization-unconstrained.rs diff --git a/tests/ui/traits/new-solver/specialization-unconstrained.stderr b/tests/ui/traits/next-solver/specialization-unconstrained.stderr similarity index 100% rename from tests/ui/traits/new-solver/specialization-unconstrained.stderr rename to tests/ui/traits/next-solver/specialization-unconstrained.stderr diff --git a/tests/ui/traits/new-solver/stall-num-var-auto-trait.fallback.stderr b/tests/ui/traits/next-solver/stall-num-var-auto-trait.fallback.stderr similarity index 100% rename from tests/ui/traits/new-solver/stall-num-var-auto-trait.fallback.stderr rename to tests/ui/traits/next-solver/stall-num-var-auto-trait.fallback.stderr diff --git a/tests/ui/traits/new-solver/stall-num-var-auto-trait.rs b/tests/ui/traits/next-solver/stall-num-var-auto-trait.rs similarity index 100% rename from tests/ui/traits/new-solver/stall-num-var-auto-trait.rs rename to tests/ui/traits/next-solver/stall-num-var-auto-trait.rs diff --git a/tests/ui/traits/new-solver/structural-resolve-field.rs b/tests/ui/traits/next-solver/structural-resolve-field.rs similarity index 100% rename from tests/ui/traits/new-solver/structural-resolve-field.rs rename to tests/ui/traits/next-solver/structural-resolve-field.rs diff --git a/tests/ui/traits/new-solver/tait-eq-proj-2.rs b/tests/ui/traits/next-solver/tait-eq-proj-2.rs similarity index 87% rename from tests/ui/traits/new-solver/tait-eq-proj-2.rs rename to tests/ui/traits/next-solver/tait-eq-proj-2.rs index 7873ba0d7bac7..a3df053dd8325 100644 --- a/tests/ui/traits/new-solver/tait-eq-proj-2.rs +++ b/tests/ui/traits/next-solver/tait-eq-proj-2.rs @@ -3,7 +3,7 @@ #![feature(type_alias_impl_trait)] -// Similar to tests/ui/traits/new-solver/tait-eq-proj.rs +// Similar to tests/ui/traits/next-solver/tait-eq-proj.rs // but check the alias-sub relation in the other direction. type Tait = impl Iterator; diff --git a/tests/ui/traits/new-solver/tait-eq-proj.rs b/tests/ui/traits/next-solver/tait-eq-proj.rs similarity index 100% rename from tests/ui/traits/new-solver/tait-eq-proj.rs rename to tests/ui/traits/next-solver/tait-eq-proj.rs diff --git a/tests/ui/traits/new-solver/tait-eq-tait.rs b/tests/ui/traits/next-solver/tait-eq-tait.rs similarity index 100% rename from tests/ui/traits/new-solver/tait-eq-tait.rs rename to tests/ui/traits/next-solver/tait-eq-tait.rs diff --git a/tests/ui/traits/new-solver/temporary-ambiguity.rs b/tests/ui/traits/next-solver/temporary-ambiguity.rs similarity index 100% rename from tests/ui/traits/new-solver/temporary-ambiguity.rs rename to tests/ui/traits/next-solver/temporary-ambiguity.rs diff --git a/tests/ui/traits/new-solver/trait-upcast-lhs-needs-normalization.rs b/tests/ui/traits/next-solver/trait-upcast-lhs-needs-normalization.rs similarity index 100% rename from tests/ui/traits/new-solver/trait-upcast-lhs-needs-normalization.rs rename to tests/ui/traits/next-solver/trait-upcast-lhs-needs-normalization.rs diff --git a/tests/ui/traits/new-solver/try-example.rs b/tests/ui/traits/next-solver/try-example.rs similarity index 100% rename from tests/ui/traits/new-solver/try-example.rs rename to tests/ui/traits/next-solver/try-example.rs diff --git a/tests/ui/traits/new-solver/two-projection-param-candidates-are-ambiguous.rs b/tests/ui/traits/next-solver/two-projection-param-candidates-are-ambiguous.rs similarity index 100% rename from tests/ui/traits/new-solver/two-projection-param-candidates-are-ambiguous.rs rename to tests/ui/traits/next-solver/two-projection-param-candidates-are-ambiguous.rs diff --git a/tests/ui/traits/new-solver/two-projection-param-candidates-are-ambiguous.stderr b/tests/ui/traits/next-solver/two-projection-param-candidates-are-ambiguous.stderr similarity index 100% rename from tests/ui/traits/new-solver/two-projection-param-candidates-are-ambiguous.stderr rename to tests/ui/traits/next-solver/two-projection-param-candidates-are-ambiguous.stderr diff --git a/tests/ui/traits/new-solver/unevaluated-const-impl-trait-ref.fails.stderr b/tests/ui/traits/next-solver/unevaluated-const-impl-trait-ref.fails.stderr similarity index 100% rename from tests/ui/traits/new-solver/unevaluated-const-impl-trait-ref.fails.stderr rename to tests/ui/traits/next-solver/unevaluated-const-impl-trait-ref.fails.stderr diff --git a/tests/ui/traits/new-solver/unevaluated-const-impl-trait-ref.rs b/tests/ui/traits/next-solver/unevaluated-const-impl-trait-ref.rs similarity index 100% rename from tests/ui/traits/new-solver/unevaluated-const-impl-trait-ref.rs rename to tests/ui/traits/next-solver/unevaluated-const-impl-trait-ref.rs diff --git a/tests/ui/traits/new-solver/unsafe-auto-trait-impl.rs b/tests/ui/traits/next-solver/unsafe-auto-trait-impl.rs similarity index 100% rename from tests/ui/traits/new-solver/unsafe-auto-trait-impl.rs rename to tests/ui/traits/next-solver/unsafe-auto-trait-impl.rs diff --git a/tests/ui/traits/new-solver/unsize-although-ambiguous.rs b/tests/ui/traits/next-solver/unsize-although-ambiguous.rs similarity index 100% rename from tests/ui/traits/new-solver/unsize-although-ambiguous.rs rename to tests/ui/traits/next-solver/unsize-although-ambiguous.rs diff --git a/tests/ui/traits/new-solver/unsize-good.rs b/tests/ui/traits/next-solver/unsize-good.rs similarity index 100% rename from tests/ui/traits/new-solver/unsize-good.rs rename to tests/ui/traits/next-solver/unsize-good.rs diff --git a/tests/ui/traits/new-solver/upcast-right-substs.rs b/tests/ui/traits/next-solver/upcast-right-substs.rs similarity index 100% rename from tests/ui/traits/new-solver/upcast-right-substs.rs rename to tests/ui/traits/next-solver/upcast-right-substs.rs diff --git a/tests/ui/traits/new-solver/upcast-wrong-substs.rs b/tests/ui/traits/next-solver/upcast-wrong-substs.rs similarity index 100% rename from tests/ui/traits/new-solver/upcast-wrong-substs.rs rename to tests/ui/traits/next-solver/upcast-wrong-substs.rs diff --git a/tests/ui/traits/new-solver/upcast-wrong-substs.stderr b/tests/ui/traits/next-solver/upcast-wrong-substs.stderr similarity index 100% rename from tests/ui/traits/new-solver/upcast-wrong-substs.stderr rename to tests/ui/traits/next-solver/upcast-wrong-substs.stderr diff --git a/tests/ui/traits/new-solver/winnow-specializing-impls.rs b/tests/ui/traits/next-solver/winnow-specializing-impls.rs similarity index 100% rename from tests/ui/traits/new-solver/winnow-specializing-impls.rs rename to tests/ui/traits/next-solver/winnow-specializing-impls.rs