diff --git a/compiler/rustc_hir_analysis/src/check/wfcheck.rs b/compiler/rustc_hir_analysis/src/check/wfcheck.rs
index d5f17a5cbb75..460a9d776530 100644
--- a/compiler/rustc_hir_analysis/src/check/wfcheck.rs
+++ b/compiler/rustc_hir_analysis/src/check/wfcheck.rs
@@ -904,7 +904,7 @@ fn check_param_wf(tcx: TyCtxt<'_>, param: &ty::GenericParamDef) -> Result<(), Er
                     ) => None,
                     Err(ConstParamTyImplementationError::UnsizedConstParamsFeatureRequired) => {
                         Some(vec![
-                            (adt_const_params_feature_string, sym::adt_const_params),
+                            (adt_const_params_feature_string, sym::min_adt_const_params),
                             (
                                 " references to implement the `ConstParamTy` trait".into(),
                                 sym::unsized_const_params,
@@ -931,11 +931,13 @@ fn ty_is_local(ty: Ty<'_>) -> bool {
 
                         ty_is_local(ty).then_some(vec![(
                             adt_const_params_feature_string,
-                            sym::adt_const_params,
+                            sym::min_adt_const_params,
                         )])
                     }
                     // Implements `ConstParamTy`, suggest adding the feature to enable.
-                    Ok(..) => Some(vec![(adt_const_params_feature_string, sym::adt_const_params)]),
+                    Ok(..) => {
+                        Some(vec![(adt_const_params_feature_string, sym::min_adt_const_params)])
+                    }
                 };
                 if let Some(features) = may_suggest_feature {
                     tcx.disabled_nightly_features(&mut diag, features);
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
index 11c3c6fe19ab..9597e2fab49c 100644
--- a/library/core/src/marker.rs
+++ b/library/core/src/marker.rs
@@ -1095,9 +1095,13 @@ pub trait ConstParamTy_: StructuralPartialEq + Eq {}
     /* compiler built-in */
 }
 
+// For `adt_const_params` to be recognized as a feature
+#[unstable(feature = "adt_const_params", issue = "95174")]
+const _: () = ();
+
 // FIXME(adt_const_params): handle `ty::FnDef`/`ty::Closure`
 marker_impls! {
-    #[unstable(feature = "adt_const_params", issue = "95174")]
+    #[unstable(feature = "min_adt_const_params", issue = "154042")]
     ConstParamTy_ for
         usize, u8, u16, u32, u64, u128,
         isize, i8, i16, i32, i64, i128,
diff --git a/library/core/src/tuple.rs b/library/core/src/tuple.rs
index 58f81372aff7..187e201c3cea 100644
--- a/library/core/src/tuple.rs
+++ b/library/core/src/tuple.rs
@@ -47,8 +47,7 @@ impl<$($T: [const] Eq),+> const Eq for ($($T,)+)
 
         maybe_tuple_doc! {
             $($T)+ @
-            #[unstable(feature = "adt_const_params", issue = "95174")]
-            #[unstable_feature_bound(unsized_const_params)]
+            #[unstable(feature = "min_adt_const_params", issue = "154042")]
             impl<$($T: ConstParamTy_),+> ConstParamTy_ for ($($T,)+)
             {}
         }
diff --git a/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.rs b/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.rs
index 33988bc06785..f9898e26a8bb 100644
--- a/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.rs
+++ b/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.rs
@@ -5,9 +5,9 @@
 // Can never be used as const generics.
 fn uwu_0<const N: &'static mut ()>() {}
 //~^ ERROR: forbidden as the type of a const generic
-//~| HELP: add `#![feature(adt_const_params)]`
-//~| HELP: add `#![feature(adt_const_params)]`
-//~| HELP: add `#![feature(adt_const_params)]`
+//~| HELP: add `#![feature(min_adt_const_params)]`
+//~| HELP: add `#![feature(min_adt_const_params)]`
+//~| HELP: add `#![feature(min_adt_const_params)]`
 //~| HELP: add `#![feature(unsized_const_params)]`
 //~| HELP: add `#![feature(unsized_const_params)]`
 
diff --git a/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr b/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr
index 8c54aef36cac..2f9f2af38217 100644
--- a/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr
+++ b/tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr
@@ -13,9 +13,9 @@ LL | fn owo_0<const N: &'static u32>() {}
    |                   ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
@@ -29,9 +29,9 @@ LL | fn meow_0<const N: Meow>() {}
    |                    ^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `&'static Meow` is forbidden as the type of a const generic parameter
@@ -41,9 +41,9 @@ LL | fn meow_1<const N: &'static Meow>() {}
    |                    ^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/adt_const_params/tuple-wihtout-unsized_const_params-gate.rs b/tests/ui/const-generics/adt_const_params/tuple-wihtout-unsized_const_params-gate.rs
new file mode 100644
index 000000000000..9fd584b10974
--- /dev/null
+++ b/tests/ui/const-generics/adt_const_params/tuple-wihtout-unsized_const_params-gate.rs
@@ -0,0 +1,14 @@
+//! Ensure we allow tuples behind `min_adt_const_params`
+//@check-pass
+#![feature(min_adt_const_params)]
+#![allow(dead_code)]
+
+use std::marker::ConstParamTy;
+
+fn foo<const N: (i32, u32, i16)>() {}
+fn foo2<const TUP: Something>() {}
+
+#[derive(PartialEq, Eq, ConstParamTy)]
+struct Something(i8, i16, i32);
+
+fn main() {}
diff --git a/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr b/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
index 44fcf9a13b12..3a5419588cae 100644
--- a/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
+++ b/tests/ui/const-generics/const-param-type-depends-on-const-param.min.stderr
@@ -17,9 +17,9 @@ LL | pub struct Dependent<const N: usize, const X: [u8; N]>([(); N]);
    |                                               ^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `[u8; N]` is forbidden as the type of a const generic parameter
@@ -29,9 +29,9 @@ LL | pub struct SelfDependent<const N: [u8; N]>;
    |                                   ^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 4 previous errors
diff --git a/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
index 1f93c4f89098..3b65a1b82fdf 100644
--- a/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/array-size-in-generic-struct-param.min.stderr
@@ -23,9 +23,9 @@ LL | struct B<const CFG: Config> {
    |                     ^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 3 previous errors
diff --git a/tests/ui/const-generics/generic_const_exprs/error_in_ty.stderr b/tests/ui/const-generics/generic_const_exprs/error_in_ty.stderr
index e10ea5a44b26..6c017c8cc6ba 100644
--- a/tests/ui/const-generics/generic_const_exprs/error_in_ty.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/error_in_ty.stderr
@@ -19,9 +19,9 @@ LL | pub struct A<const z: [usize; x]> {}
    |                       ^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error[E0308]: mismatched types
diff --git a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
index 4fab35591ef4..022074181cec 100644
--- a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
+++ b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
@@ -82,9 +82,9 @@ LL |     pub struct v17<const v10: usize, const v7: v11> {
    |                                                ^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error[E0425]: cannot find function `v6` in this scope
diff --git a/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
index 506f7d05fa63..324738e44629 100644
--- a/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
+++ b/tests/ui/const-generics/intrinsics-type_name-as-const-argument.min.stderr
@@ -14,9 +14,9 @@ LL | trait Trait<const S: &'static str> {}
    |                      ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/issues/issue-62878.min.stderr b/tests/ui/const-generics/issues/issue-62878.min.stderr
index d7ca0e1e2db5..754e76269bdb 100644
--- a/tests/ui/const-generics/issues/issue-62878.min.stderr
+++ b/tests/ui/const-generics/issues/issue-62878.min.stderr
@@ -11,9 +11,9 @@ LL | fn foo<const N: usize, const A: [u8; N]>() {}
    |                                 ^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
index f14485a4976e..aee5bb965331 100644
--- a/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
+++ b/tests/ui/const-generics/issues/issue-63322-forbid-dyn.min.stderr
@@ -5,9 +5,9 @@ LL | fn test<const T: &'static dyn A>() {
    |                  ^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/issues/issue-68366.full.stderr b/tests/ui/const-generics/issues/issue-68366.full.stderr
index caed3c1bf3f7..02c34b8256d6 100644
--- a/tests/ui/const-generics/issues/issue-68366.full.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.full.stderr
@@ -5,9 +5,9 @@ LL | struct Collatz<const N: Option<usize>>;
    |                         ^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
diff --git a/tests/ui/const-generics/issues/issue-68366.min.stderr b/tests/ui/const-generics/issues/issue-68366.min.stderr
index 4d721e958cbc..4b544c49af8c 100644
--- a/tests/ui/const-generics/issues/issue-68366.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68366.min.stderr
@@ -14,9 +14,9 @@ LL | struct Collatz<const N: Option<usize>>;
    |                         ^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
diff --git a/tests/ui/const-generics/issues/issue-68615-adt.min.stderr b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
index d25b34435ede..ace0cf241195 100644
--- a/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-adt.min.stderr
@@ -5,9 +5,9 @@ LL | struct Const<const V: [usize; 0]> {}
    |                       ^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/issues/issue-68615-array.min.stderr b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
index 60cbc9b4eab1..a0139845eaa1 100644
--- a/tests/ui/const-generics/issues/issue-68615-array.min.stderr
+++ b/tests/ui/const-generics/issues/issue-68615-array.min.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<const V: [usize; 0] > {}
    |                     ^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/issues/issue-71169.min.stderr b/tests/ui/const-generics/issues/issue-71169.min.stderr
index c04a710eee9c..13adc4b627a0 100644
--- a/tests/ui/const-generics/issues/issue-71169.min.stderr
+++ b/tests/ui/const-generics/issues/issue-71169.min.stderr
@@ -11,9 +11,9 @@ LL | fn foo<const LEN: usize, const DATA: [u8; LEN]>() {}
    |                                      ^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/const-generics/issues/issue-73491.min.stderr b/tests/ui/const-generics/issues/issue-73491.min.stderr
index 2cdbeea2fd6e..292836a370a5 100644
--- a/tests/ui/const-generics/issues/issue-73491.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73491.min.stderr
@@ -5,9 +5,9 @@ LL | fn hoge<const IN: [u32; LEN]>() {}
    |                   ^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
index 256636c0628c..21328eb16f2a 100644
--- a/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
+++ b/tests/ui/const-generics/issues/issue-73727-static-reference-array-const-param.min.stderr
@@ -5,9 +5,9 @@ LL | fn a<const X: &'static [u32]>() {}
    |               ^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/issues/issue-74101.min.stderr b/tests/ui/const-generics/issues/issue-74101.min.stderr
index 65fb51d7df99..f8195c2ba952 100644
--- a/tests/ui/const-generics/issues/issue-74101.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74101.min.stderr
@@ -5,9 +5,9 @@ LL | fn test<const N: [u8; 1 + 2]>() {}
    |                  ^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `[u8; 1 + 2]` is forbidden as the type of a const generic parameter
@@ -17,9 +17,9 @@ LL | struct Foo<const N: [u8; 1 + 2]>;
    |                     ^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/const-generics/issues/issue-74255.min.stderr b/tests/ui/const-generics/issues/issue-74255.min.stderr
index 3b30227a9a67..945f34c47d01 100644
--- a/tests/ui/const-generics/issues/issue-74255.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74255.min.stderr
@@ -5,9 +5,9 @@ LL |     fn ice_struct_fn<const I: IceEnum>() {}
    |                               ^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/issues/issue-74950.min.stderr b/tests/ui/const-generics/issues/issue-74950.min.stderr
index 22537af786b1..b5a8db4936b3 100644
--- a/tests/ui/const-generics/issues/issue-74950.min.stderr
+++ b/tests/ui/const-generics/issues/issue-74950.min.stderr
@@ -5,9 +5,9 @@ LL | struct Outer<const I: Inner>;
    |                       ^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `Inner` is forbidden as the type of a const generic parameter
@@ -18,9 +18,9 @@ LL | struct Outer<const I: Inner>;
    |
    = note: the only supported types are integers, `bool`, and `char`
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `Inner` is forbidden as the type of a const generic parameter
@@ -31,9 +31,9 @@ LL | struct Outer<const I: Inner>;
    |
    = note: the only supported types are integers, `bool`, and `char`
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `Inner` is forbidden as the type of a const generic parameter
@@ -44,9 +44,9 @@ LL | struct Outer<const I: Inner>;
    |
    = note: the only supported types are integers, `bool`, and `char`
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 4 previous errors
diff --git a/tests/ui/const-generics/issues/issue-75047.min.stderr b/tests/ui/const-generics/issues/issue-75047.min.stderr
index d78ab6718201..2b17dbf9003d 100644
--- a/tests/ui/const-generics/issues/issue-75047.min.stderr
+++ b/tests/ui/const-generics/issues/issue-75047.min.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<const N: [u8; Bar::<u32>::value()]>;
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/const-generics/min_const_generics/complex-types.stderr b/tests/ui/const-generics/min_const_generics/complex-types.stderr
index bca68982c399..3233da638238 100644
--- a/tests/ui/const-generics/min_const_generics/complex-types.stderr
+++ b/tests/ui/const-generics/min_const_generics/complex-types.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<const N: [u8; 0]>;
    |                     ^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `()` is forbidden as the type of a const generic parameter
@@ -17,9 +17,9 @@ LL | struct Bar<const N: ()>;
    |                     ^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `No` is forbidden as the type of a const generic parameter
@@ -29,9 +29,9 @@ LL | struct Fez<const N: No>;
    |                     ^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `&'static u8` is forbidden as the type of a const generic parameter
@@ -41,9 +41,9 @@ LL | struct Faz<const N: &'static u8>;
    |                     ^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
@@ -65,9 +65,9 @@ LL | enum Goo<const N: ()> { A, B }
    |                   ^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `()` is forbidden as the type of a const generic parameter
@@ -77,9 +77,9 @@ LL | union Boo<const N: ()> { a: () }
    |                    ^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 7 previous errors
diff --git a/tests/ui/const-generics/nested-type.min.stderr b/tests/ui/const-generics/nested-type.min.stderr
index 8282acd4ea7b..ff1561214090 100644
--- a/tests/ui/const-generics/nested-type.min.stderr
+++ b/tests/ui/const-generics/nested-type.min.stderr
@@ -29,9 +29,9 @@ LL | | }]>;
    | |__^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/const-generics/slice-const-param-mismatch.min.stderr b/tests/ui/const-generics/slice-const-param-mismatch.min.stderr
index 594f8b9b79a3..8e167d369756 100644
--- a/tests/ui/const-generics/slice-const-param-mismatch.min.stderr
+++ b/tests/ui/const-generics/slice-const-param-mismatch.min.stderr
@@ -5,9 +5,9 @@ LL | struct ConstString<const T: &'static str>;
    |                             ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
@@ -21,9 +21,9 @@ LL | struct ConstBytes<const T: &'static [u8]>;
    |                            ^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/std/const-generics-range.min.stderr b/tests/ui/const-generics/std/const-generics-range.min.stderr
index 43a57c880d5d..f302085254c6 100644
--- a/tests/ui/const-generics/std/const-generics-range.min.stderr
+++ b/tests/ui/const-generics/std/const-generics-range.min.stderr
@@ -5,9 +5,9 @@ LL | struct _Range<const R: std::ops::Range<usize>>;
    |                        ^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `std::ops::RangeFrom<usize>` is forbidden as the type of a const generic parameter
@@ -17,9 +17,9 @@ LL | struct _RangeFrom<const R: std::ops::RangeFrom<usize>>;
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `RangeFull` is forbidden as the type of a const generic parameter
@@ -29,9 +29,9 @@ LL | struct _RangeFull<const R: std::ops::RangeFull>;
    |                            ^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `std::ops::RangeInclusive<usize>` is forbidden as the type of a const generic parameter
@@ -41,9 +41,9 @@ LL | struct _RangeInclusive<const R: std::ops::RangeInclusive<usize>>;
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `RangeTo<usize>` is forbidden as the type of a const generic parameter
@@ -53,9 +53,9 @@ LL | struct _RangeTo<const R: std::ops::RangeTo<usize>>;
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `std::ops::RangeToInclusive<usize>` is forbidden as the type of a const generic parameter
@@ -65,9 +65,9 @@ LL | struct _RangeToInclusive<const R: std::ops::RangeToInclusive<usize>>;
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 6 previous errors
diff --git a/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr b/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr
index 911afa3391d1..b8876b33295c 100644
--- a/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr
+++ b/tests/ui/const-generics/transmute-const-param-static-reference.min.stderr
@@ -5,9 +5,9 @@ LL | struct Const<const P: &'static ()>;
    |                       ^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/const-generics/type-dependent/issue-71348.min.stderr b/tests/ui/const-generics/type-dependent/issue-71348.min.stderr
index c491469bcbd2..1555049b877f 100644
--- a/tests/ui/const-generics/type-dependent/issue-71348.min.stderr
+++ b/tests/ui/const-generics/type-dependent/issue-71348.min.stderr
@@ -5,9 +5,9 @@ LL | trait Get<'a, const N: &'static str> {
    |                        ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
@@ -21,9 +21,9 @@ LL |     fn ask<'a, const N: &'static str>(&'a self) -> &'a <Self as Get<N>>::Ta
    |                         ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/feature-gates/feature-gate-adt_const_params.stderr b/tests/ui/feature-gates/feature-gate-adt_const_params.stderr
index 7ea91a8f4c2b..607e7869c789 100644
--- a/tests/ui/feature-gates/feature-gate-adt_const_params.stderr
+++ b/tests/ui/feature-gates/feature-gate-adt_const_params.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<const N: Bar>;
    |                     ^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/feature-gates/feature-gate-generic-const-parameter-types.normal.stderr b/tests/ui/feature-gates/feature-gate-generic-const-parameter-types.normal.stderr
index 1377f845d164..48b3c43c30a0 100644
--- a/tests/ui/feature-gates/feature-gate-generic-const-parameter-types.normal.stderr
+++ b/tests/ui/feature-gates/feature-gate-generic-const-parameter-types.normal.stderr
@@ -11,9 +11,9 @@ LL | struct MyADT<const LEN: usize, const ARRAY: [u8; LEN]>;
    |                                             ^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/feature-gates/feature-gate-unsized-const-params.rs b/tests/ui/feature-gates/feature-gate-unsized-const-params.rs
index d088d382377c..c38aa3ea4f75 100644
--- a/tests/ui/feature-gates/feature-gate-unsized-const-params.rs
+++ b/tests/ui/feature-gates/feature-gate-unsized-const-params.rs
@@ -1,6 +1,6 @@
 struct Foo<const N: [u8]>;
 //~^ ERROR: `[u8]` is forbidden as the type of a const generic parameter
-//~| HELP: add `#![feature(adt_const_params)]` to the crate
+//~| HELP: add `#![feature(min_adt_const_params)]` to the crate
 //~| HELP: add `#![feature(unsized_const_params)]` to the crate
 
 fn main() {}
diff --git a/tests/ui/feature-gates/feature-gate-unsized-const-params.stderr b/tests/ui/feature-gates/feature-gate-unsized-const-params.stderr
index 85ca2f59cb63..90906058dfe6 100644
--- a/tests/ui/feature-gates/feature-gate-unsized-const-params.stderr
+++ b/tests/ui/feature-gates/feature-gate-unsized-const-params.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<const N: [u8]>;
    |                     ^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
diff --git a/tests/ui/traits/const-traits/mismatched_generic_args.stderr b/tests/ui/traits/const-traits/mismatched_generic_args.stderr
index 3094cb501330..7dfbe7509947 100644
--- a/tests/ui/traits/const-traits/mismatched_generic_args.stderr
+++ b/tests/ui/traits/const-traits/mismatched_generic_args.stderr
@@ -20,9 +20,9 @@ LL | pub struct Quantity<S, const D: Dimension>(S);
    |                                 ^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error[E0107]: trait takes at most 1 generic argument but 2 generic arguments were supplied
@@ -38,9 +38,9 @@ LL | impl<const D: Dimension, LHS, RHS> Add<LHS, D> for Quantity<LHS, { Dimensio
    |               ^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: `Dimension` is forbidden as the type of a const generic parameter
@@ -50,9 +50,9 @@ LL | pub fn add<const U: Dimension>(x: Quantity<f32, U>) -> Quantity<f32, U> {
    |                     ^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 
 error: aborting due to 5 previous errors
diff --git a/tests/ui/typeck/ice-unexpected-region-123863.stderr b/tests/ui/typeck/ice-unexpected-region-123863.stderr
index e5050b4d3167..c529fe750890 100644
--- a/tests/ui/typeck/ice-unexpected-region-123863.stderr
+++ b/tests/ui/typeck/ice-unexpected-region-123863.stderr
@@ -5,9 +5,9 @@ LL | const fn concat_strs<const A: &'static str>() -> &'static str {
    |                               ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |
@@ -21,9 +21,9 @@ LL |     struct Inner<const A: &'static str>;
    |                           ^^^^^^^^^^^^
    |
    = note: the only supported types are integers, `bool`, and `char`
-help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
+help: add `#![feature(min_adt_const_params)]` to the crate attributes to enable more complex and user defined types
    |
-LL + #![feature(adt_const_params)]
+LL + #![feature(min_adt_const_params)]
    |
 help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
    |