Skip to content
This repository was archived by the owner on Aug 16, 2021. It is now read-only.

Commit 3714653

Browse files
authored
Merge pull request #269 from ia0/rust_issues_61053
Fix meta variable misuse
2 parents 7e16fd2 + f942424 commit 3714653

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Diff for: src/impl_error_chain_kind.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ macro_rules! impl_error_chain_kind {
8585
queue [ #[$qmeta:meta] $( $tail:tt )*]
8686
) => {
8787
impl_error_chain_kind!(SORT [$( $def )*]
88-
enum [$( $(#[$emeta])* => $eitem $(( $($etyp),* ))* )*
89-
$(#[$bmeta])* => $bitem: $bmode $(( $($btyp),* ))*]
88+
enum [$(#[$bmeta])* => $bitem: $bmode $(( $($btyp),* ))*]
9089
items [$($( #[$imeta:meta] )*
9190
=> $iitem: $imode [$( $ivar:$ityp ),*] {$( $ifuncs )*} )*
9291
$bitem: $bmode [$( $bvar:$btyp ),*] {} ]
@@ -103,7 +102,7 @@ macro_rules! impl_error_chain_kind {
103102
) => {
104103
impl_error_chain_kind!(SORT [$( $def )*]
105104
items [$( $(#[$imeta])* => $iitem: $imode [$( $ivar:$ityp ),*] {$( $ifuncs )*} )*]
106-
buf [$( #[$bmeta] )* => $bitem: TUPLE [$( $qvar:$qtyp ),*] ]
105+
buf [$( #[$bmeta] )* => $bitem: TUPLE [$( $qvar:$qtyp ),+] ]
107106
queue [$( $tail )*]
108107
);
109108
};
@@ -117,7 +116,7 @@ macro_rules! impl_error_chain_kind {
117116
) => {
118117
impl_error_chain_kind!(SORT [$( $def )*]
119118
items [$( $(#[$imeta])* => $iitem: $imode [$( $ivar:$ityp ),*] {$( $ifuncs )*} )*]
120-
buf [$( #[$bmeta] )* => $bitem: STRUCT [$( $qvar:$qtyp ),*] ]
119+
buf [$( #[$bmeta] )* => $bitem: STRUCT [$( $qvar:$qtyp ),+] ]
121120
queue [$( $tail )*]);
122121
};
123122
// Add struct enum-variant, with excess comma - e.g. { descr: &'static str, }
@@ -130,7 +129,7 @@ macro_rules! impl_error_chain_kind {
130129
) => {
131130
impl_error_chain_kind!(SORT [$( $def )*]
132131
items [$( $(#[$imeta])* => $iitem: $imode [$( $ivar:$ityp ),*] {$( $ifuncs )*} )*]
133-
buf [$( #[$bmeta] )* => $bitem: STRUCT [$( $qvar:$qtyp ),*] ]
132+
buf [$( #[$bmeta] )* => $bitem: STRUCT [$( $qvar:$qtyp ),+] ]
134133
queue [$( $tail )*]);
135134
};
136135
// Add braces and flush always on braces
@@ -188,7 +187,7 @@ macro_rules! impl_error_chain_kind {
188187
pub enum $name {
189188
$(
190189
$(#[$imeta])*
191-
$iitem $(($( $ttyp ),*))* $({$( $svar: $styp ),*})*,
190+
$iitem $(($( $ttyp ),+))* $({$( $svar: $styp ),*})*,
192191
)*
193192

194193
#[doc(hidden)]
@@ -217,7 +216,7 @@ macro_rules! impl_error_chain_kind {
217216
) => {
218217
impl_error_chain_kind!(ENUM_DEFINITION [ $($def)* ]
219218
body [$($( #[$imeta] )* => $iitem ($(($( $ttyp ),+))*) {$({$( $svar: $styp ),*})*} )*
220-
$( #[$qmeta] )* => $qitem (($( $qtyp ),*)) {} ]
219+
$( #[$qmeta] )* => $qitem (($( $qtyp ),+)) {} ]
221220
queue [ $($queue)* ]
222221
);
223222
};

0 commit comments

Comments
 (0)