Skip to content

Commit 0a2d8e4

Browse files
authored
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
2 parents 663f3d5 + 2ed9c9f commit 0a2d8e4

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

core/src/marker.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -996,15 +996,12 @@ marker_impls! {
996996
bool,
997997
char,
998998
str /* Technically requires `[u8]: ConstParamTy` */,
999+
(),
9991000
{T: ConstParamTy, const N: usize} [T; N],
10001001
{T: ConstParamTy} [T],
10011002
{T: ?Sized + ConstParamTy} &T,
10021003
}
10031004

1004-
// FIXME(adt_const_params): Add to marker_impls call above once not in bootstrap
1005-
#[unstable(feature = "adt_const_params", issue = "95174")]
1006-
impl ConstParamTy for () {}
1007-
10081005
/// A common trait implemented by all function pointers.
10091006
#[unstable(
10101007
feature = "fn_ptr_trait",

0 commit comments

Comments
 (0)