mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #111810 - compiler-errors:less-macro, r=thomcc

Browse Source 
Don't use inner macro in `marker_impls`

Just recurse instead of having to define an inner macro to avoid the problem with expansion binders being misnumbered between the `$meta` and `$T` variables.

cc `@Veykril` this should fix rust-lang/rust-analyzer#14862 since we've gotten rid of the inner macro.
This commit is contained in:
Matthias Krüger 2023-05-22 06:54:16 +02:00 committed by GitHub
commit b0415dbec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/core/src/marker.rs
View File

@ -43,27 +43,17 @@ use crate::hash::Hasher;
/// ``` /// ```
#[unstable(feature = "internal_impls_macro", issue = "none")] #[unstable(feature = "internal_impls_macro", issue = "none")]
macro marker_impls { macro marker_impls {
( $(#[$($meta:tt)*])* $Trait:ident for $( $({$($bounds:tt)*})? $T:ty ),+ $(,)?) => { ( $(#[$($meta:tt)*])* $Trait:ident for $({$($bounds:tt)*})? $T:ty $(, $($rest:tt)*)? ) => {
// This inner macro is needed because... idk macros are weird. $(#[$($meta)*])* impl< $($($bounds)*)? > $Trait for $T {}
// It allows repeating `meta` on all impls. marker_impls! { $(#[$($meta)*])* $Trait for $($($rest)*)? }
#[unstable(feature = "internal_impls_macro", issue = "none")]
macro _impl {
( $$({$$($$bounds_:tt)*})? $$T_:ty ) => {
$(#[$($meta)*])* impl<$$($$($$bounds_)*)?> $Trait for $$T_ {}
}
}
$( _impl! { $({$($bounds)*})? $T } )+
}, },
( $(#[$($meta:tt)*])* unsafe $Trait:ident for $( $({$($bounds:tt)*})? $T:ty ),+ $(,)?) => { ( $(#[$($meta:tt)*])* $Trait:ident for ) => {},
#[unstable(feature = "internal_impls_macro", issue = "none")]
macro _impl {
( $$({$$($$bounds_:tt)*})? $$T_:ty ) => {
$(#[$($meta)*])* unsafe impl<$$($$($$bounds_)*)?> $Trait for $$T_ {}
}
}
$( _impl! { $({$($bounds)*})? $T } )+ ( $(#[$($meta:tt)*])* unsafe $Trait:ident for $({$($bounds:tt)*})? $T:ty $(, $($rest:tt)*)? ) => {
$(#[$($meta)*])* unsafe impl< $($($bounds)*)? > $Trait for $T {}
marker_impls! { $(#[$($meta)*])* unsafe $Trait for $($($rest)*)? }
}, },
( $(#[$($meta:tt)*])* unsafe $Trait:ident for ) => {},
} }
/// Types that can be transferred across thread boundaries. /// Types that can be transferred across thread boundaries.