Rollup merge of rust-lang#127070 - Sky9x:unit-const-param-ty, r=BoxyUwU

add () to the marker_impls macro for ConstParamTy Seems to have escaped bootstrap
matthiaskrgr · Jun 28, 2024 · 6499b9c · 6499b9c
2 parents 5afb4c2 + 8bcd1de
commit 6499b9c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
@@ -996,15 +996,12 @@ marker_impls! {
         bool,
         char,
         str /* Technically requires `[u8]: ConstParamTy` */,
+        (),
         {T: ConstParamTy, const N: usize} [T; N],
         {T: ConstParamTy} [T],
         {T: ?Sized + ConstParamTy} &T,
 }
 
-// FIXME(adt_const_params): Add to marker_impls call above once not in bootstrap
-#[unstable(feature = "adt_const_params", issue = "95174")]
-impl ConstParamTy for () {}
-
 /// A common trait implemented by all function pointers.
 #[unstable(
     feature = "fn_ptr_trait",