Rollup merge of rust-lang#150869 - fix/150841, r=BoxyUwU

Emit error instead of delayed bug when meeting mismatch type for const tuple

And rename some tests

Fixes rust-lang#150841

r? @BoxyUwU

Author: tgross35

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2533,11 +2533,12 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
         let tcx = self.tcx();
 
         let FeedConstTy::WithTy(ty) = feed else {
-            return Const::new_error_with_message(tcx, span, "unsupported const tuple");
+            return Const::new_error_with_message(tcx, span, "const tuple lack type information");
         };
 
         let ty::Tuple(tys) = ty.kind() else {
-            return Const::new_error_with_message(tcx, span, "const tuple must have a tuple type");
+            let e = tcx.dcx().span_err(span, format!("expected `{}`, found const tuple", ty));
+            return Const::new_error(tcx, e);
         };
 
         let exprs = exprs

…/mgca/adt_expr_arg_tuple_expr_complex.rs …-generics/mgca/tuple_expr_arg_complex.rstests/ui/const-generics/mgca/adt_expr_arg_tuple_expr_complex.rs renamed to tests/ui/const-generics/mgca/tuple_expr_arg_complex.rs tests/ui/const-generics/mgca/adt_expr_arg_tuple_expr_complex.rs renamed to tests/ui/const-generics/mgca/tuple_expr_arg_complex.rs

@@ -1,23 +1,23 @@
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/adt_expr_arg_tuple_expr_complex.rs:13:25
+  --> $DIR/tuple_expr_arg_complex.rs:13:25
    |
 LL |     takes_tuple::<{ (N, N + 1) }>();
    |                         ^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/adt_expr_arg_tuple_expr_complex.rs:14:25
+  --> $DIR/tuple_expr_arg_complex.rs:14:25
    |
 LL |     takes_tuple::<{ (N, T::ASSOC + 1) }>();
    |                         ^^^^^^^^^^^^
 
 error: complex const arguments must be placed inside of a `const` block
-  --> $DIR/adt_expr_arg_tuple_expr_complex.rs:16:36
+  --> $DIR/tuple_expr_arg_complex.rs:16:36
    |
 LL |     takes_nested_tuple::<{ (N, (N, N + 1)) }>();
    |                                    ^^^^^
 
 error: generic parameters may not be used in const operations
-  --> $DIR/adt_expr_arg_tuple_expr_complex.rs:17:44
+  --> $DIR/tuple_expr_arg_complex.rs:17:44
    |
 LL |     takes_nested_tuple::<{ (N, (N, const { N + 1 })) }>();
    |                                            ^

…a/adt_expr_arg_tuple_expr_complex.stderr …erics/mgca/tuple_expr_arg_complex.stderrtests/ui/const-generics/mgca/adt_expr_arg_tuple_expr_complex.stderr renamed to tests/ui/const-generics/mgca/tuple_expr_arg_complex.stderr tests/ui/const-generics/mgca/adt_expr_arg_tuple_expr_complex.stderr renamed to tests/ui/const-generics/mgca/tuple_expr_arg_complex.stderr

@@ -0,0 +1,8 @@
+#![feature(min_generic_const_args)]
+#![expect(incomplete_features)]
+
+pub fn takes_nested_tuple<const N: u32>() {
+    takes_nested_tuple::<{ () }> //~ ERROR expected `u32`, found const tuple
+}
+
+fn main() {}

tests/ui/const-generics/mgca/tuple_expr_arg_mismatch_type.rs

@@ -0,0 +1,8 @@
+error: expected `u32`, found const tuple
+  --> $DIR/tuple_expr_arg_mismatch_type.rs:5:28
+   |
+LL |     takes_nested_tuple::<{ () }>
+   |                            ^^
+
+error: aborting due to 1 previous error
+