Skip to content

Commit

Permalink
Rollup merge of #127070 - Sky9x:unit-const-param-ty, r=BoxyUwU
Browse files Browse the repository at this point in the history
add () to the marker_impls macro for ConstParamTy

Seems to have escaped bootstrap
  • Loading branch information
matthiaskrgr authored Jun 28, 2024
2 parents 5afb4c2 + 8bcd1de commit 6499b9c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions library/core/src/marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 6499b9c

Please sign in to comment.