Auto merge of #150844 - fmease:mv-ace-tests, r=BoxyUwU

mGCA: Move tests for assoc const bindings (formerly ACE) into dedicated directory & replace more mentions of ACE

Split out of PR #150843.
As discussed.

Somewhat obvious underlying principle: If the test checks basic or core parts of assoc const bindings and nothing else, move it, otherwise leave it even if it contains ACEs.

Motivation: It makes a lot easier for me to continue working on ACE efficiently.

r? @BoxyUwU

Author: bors

compiler/rustc_ast/src/ast.rs

@@ -2396,7 +2396,7 @@ impl FnSig {
 /// * the `G<Ty> = Ty` in `Trait<G<Ty> = Ty>`
 /// * the `A: Bound` in `Trait<A: Bound>`
 /// * the `RetTy` in `Trait(ArgTy, ArgTy) -> RetTy`
-/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `associated_const_equality`)
+/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `min_generic_const_args`)
 /// * the `f(..): Bound` in `Trait<f(..): Bound>` (feature `return_type_notation`)
 #[derive(Clone, Encodable, Decodable, Debug, Walkable)]
 pub struct AssocItemConstraint {

compiler/rustc_hir/src/hir.rs

@@ -3312,7 +3312,7 @@ pub enum ImplItemKind<'hir> {
 /// * the `G<Ty> = Ty` in `Trait<G<Ty> = Ty>`
 /// * the `A: Bound` in `Trait<A: Bound>`
 /// * the `RetTy` in `Trait(ArgTy, ArgTy) -> RetTy`
-/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `associated_const_equality`)
+/// * the `C = { Ct }` in `Trait<C = { Ct }>` (feature `min_generic_const_args`)
 /// * the `f(..): Bound` in `Trait<f(..): Bound>` (feature `return_type_notation`)
 #[derive(Debug, Clone, Copy, HashStable_Generic)]
 pub struct AssocItemConstraint<'hir> {

compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs

@@ -575,8 +575,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
                 // FIXME: point at the type params that don't have appropriate lifetimes:
                 // struct S1<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
                 //                         ----  ----     ^^^^^^^
-                // NOTE(associated_const_equality): This error should be impossible to trigger
-                //                                  with associated const equality constraints.
+                // NOTE(mgca): This error should be impossible to trigger with assoc const bindings.
                 self.validate_late_bound_regions(
                     late_bound_in_projection_ty,
                     late_bound_in_term,

compiler/rustc_hir_analysis/src/hir_ty_lowering/dyn_trait.rs

@@ -503,8 +503,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
         // FIXME: point at the type params that don't have appropriate lifetimes:
         // struct S1<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
         //                         ----  ----     ^^^^^^^
-        // NOTE(associated_const_equality): This error should be impossible to trigger
-        //                                  with associated const equality constraints.
+        // NOTE(mgca): This error should be impossible to trigger with assoc const bindings.
         self.validate_late_bound_regions(
             late_bound_in_projection_term,
             late_bound_in_term,

src/tools/tidy/src/issues.txt

@@ -33,8 +33,6 @@ ui/asm/issue-99122.rs
 ui/asm/x86_64/issue-82869.rs
 ui/asm/x86_64/issue-89875.rs
 ui/asm/x86_64/issue-96797.rs
-ui/associated-consts/issue-102335-const.rs
-ui/associated-consts/issue-105330.rs
 ui/associated-consts/issue-110933.rs
 ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.rs
 ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.rs
@@ -45,7 +43,6 @@ ui/associated-consts/issue-63496.rs
 ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
 ui/associated-consts/issue-88599-ref-self.rs
 ui/associated-consts/issue-93775.rs
-ui/associated-consts/issue-93835.rs
 ui/associated-inherent-types/issue-104260.rs
 ui/associated-inherent-types/issue-109071.rs
 ui/associated-inherent-types/issue-109299-1.rs
@@ -70,7 +67,6 @@ ui/associated-type-bounds/issue-73818.rs
 ui/associated-type-bounds/issue-79949.rs
 ui/associated-type-bounds/issue-81193.rs
 ui/associated-type-bounds/issue-83017.rs
-ui/associated-type-bounds/issue-99828.rs
 ui/associated-type-bounds/return-type-notation/issue-120208-higher-ranked-const.rs
 ui/associated-types/issue-18655.rs
 ui/associated-types/issue-19081.rs
@@ -498,6 +494,9 @@ ui/confuse-field-and-method/issue-18343.rs
 ui/confuse-field-and-method/issue-2392.rs
 ui/confuse-field-and-method/issue-32128.rs
 ui/confuse-field-and-method/issue-33784.rs
+ui/const-generics/associated-const-bindings/issue-102335-const.rs
+ui/const-generics/associated-const-bindings/issue-105330.rs
+ui/const-generics/associated-const-bindings/issue-93835.rs
 ui/const-generics/generic_arg_infer/issue-91614.rs
 ui/const-generics/generic_const_exprs/const_kind_expr/issue_114151.rs
 ui/const-generics/generic_const_exprs/issue-100217.rs

tests/ui/associated-type-bounds/const-projection-err.stock.stderr

@@ -1,5 +1,5 @@
 error[E0222]: ambiguous associated constant `K` in bounds of `Trait0`
-  --> $DIR/assoc-const-eq-ambiguity.rs:13:25
+  --> $DIR/ambiguity.rs:13:25
    |
 LL |     const K: ();
    |     -----------
@@ -17,7 +17,7 @@ LL | fn take0(_: impl Trait0<K = const { }>) {}
                    T: Parent0<i32>::K = const { }
 
 error[E0222]: ambiguous associated constant `C` in bounds of `Trait1`
-  --> $DIR/assoc-const-eq-ambiguity.rs:26:25
+  --> $DIR/ambiguity.rs:26:25
    |
 LL |     const C: i32;
    |     ------------ ambiguous `C` from `Parent1`