Skip to content

Commit 0a5d57e

Browse files
committed
Fixed field syntax parsing
1 parent a2c62de commit 0a5d57e

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

rust/kernel/init/pin_project.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ macro_rules! pin_project {
77
$vis:vis struct $name:ident $(<$($generics:ident),*>)?
88
$(where $($whr:tt)*)?
99
),
10-
@body(
11-
{
12-
$($(#[$($attr:tt)*])* $field:ident : $type:ty),*
13-
$(,)?
14-
}
15-
)
10+
@body({ $($fields:tt)* })
1611
) => {
1712
$crate::init::pin_project!(find_pinned_fields:
1813
@struct_attrs($(#[$($struct_attr)*])*),
@@ -21,7 +16,7 @@ macro_rules! pin_project {
2116
@impl_generics($($($generics),*)?),
2217
@ty_generics($($($generics),*)?),
2318
@where($($($whr)*)?),
24-
@fields_munch($($(#[$($attr)*])* $field : $type,)*),
19+
@fields_munch($($fields)*),
2520
@pinned(),
2621
@not_pinned(),
2722
@fields(),
@@ -37,12 +32,7 @@ macro_rules! pin_project {
3732
$vis:vis struct $name:ident $(<$($lifetimes:lifetime,)* $($generics:ident),+>)?
3833
$(where $($whr:tt)*)?
3934
),
40-
@body(
41-
{
42-
$($(#[$($attr:tt)*])* $field:ident : $type:ty),*
43-
$(,)?
44-
}
45-
)
35+
@body({ $($fields:tt)* })
4636
) => {
4737
$crate::init::pin_project!(find_pinned_fields:
4838
@struct_attrs($(#[$($struct_attr)*])*),
@@ -51,7 +41,7 @@ macro_rules! pin_project {
5141
@impl_generics($($($lifetimes,)* $($generics),+)?),
5242
@ty_generics($($($lifetimes,)* $($generics),+)?),
5343
@where($($($whr)*)?),
54-
@fields_munch($($(#[$($attr)*])* $field : $type,)*),
44+
@fields_munch($($fields)*),
5545
@pinned(),
5646
@not_pinned(),
5747
@fields(),

0 commit comments

Comments
 (0)