Skip to content

Commit 092df74

Browse files
ia0Geal
authored andcommitted
Fix meta variable misuse
1 parent 14d2279 commit 092df74

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/branch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ macro_rules! permutation_trait_inner(
212212
}
213213
};
214214
}
215-
succ!($it, permutation_trait_inner!($self, $input, $res, $all_done, $($id)*));
215+
succ!($it, permutation_trait_inner!($self, $input, $res, $all_done, $($id)+));
216216
});
217217
($it:tt, $self:expr, $input:ident, $res:expr, $all_done:expr, $head:ident) => ({
218218
if $res.$it.is_none() {

src/combinator/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ macro_rules! verify (
657657
$crate::combinator::verify($f, $g)($i)
658658
);
659659
($i:expr, $f:expr, $submac:ident!( $($args:tt)* )) => (
660-
$crate::combinator::verify($f, |&o| $submac2!(o, $($args)*))($i)
660+
$crate::combinator::verify($f, |&o| $submac!(o, $($args)*))($i)
661661
);
662662
);
663663

src/sequence/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ macro_rules! do_parse (
468468
#[doc(hidden)]
469469
#[macro_export]
470470
macro_rules! nom_compile_error (
471-
(( $(args:tt)* )) => ( compile_error!($($args)*) );
471+
(( $($args:tt)* )) => ( compile_error!($($args)*) );
472472
);
473473

474474
#[cfg(test)]

src/whitespace.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ macro_rules! delimited_sep (
144144
($i:expr, $separator:path, $submac1:ident!( $($args1:tt)* ), $($rest:tt)+) => ({
145145
use $crate::lib::std::result::Result::*;
146146

147-
match tuple_sep!($i, $separator, (), $submac1!($($args1)*), $($rest)*) {
147+
match tuple_sep!($i, $separator, (), $submac1!($($args1)*), $($rest)+) {
148148
Err(e) => Err(e),
149149
Ok((remaining, (_,o,_))) => {
150150
Ok((remaining, o))
151151
}
152152
}
153153
});
154154
($i:expr, $separator:path, $f:expr, $($rest:tt)+) => (
155-
delimited_sep!($i, $separator, call!($f), $($rest)*);
155+
delimited_sep!($i, $separator, call!($f), $($rest)+);
156156
);
157157
);
158158

@@ -162,15 +162,15 @@ macro_rules! separated_pair_sep (
162162
($i:expr, $separator:path, $submac1:ident!( $($args1:tt)* ), $($rest:tt)+) => ({
163163
use $crate::lib::std::result::Result::*;
164164

165-
match tuple_sep!($i, $separator, (), $submac1!($($args1)*), $($rest)*) {
165+
match tuple_sep!($i, $separator, (), $submac1!($($args1)*), $($rest)+) {
166166
Err(e) => Err(e),
167167
Ok((remaining, (o1,_,o2))) => {
168168
Ok((remaining, (o1,o2)))
169169
}
170170
}
171171
});
172172
($i:expr, $separator:path, $f:expr, $($rest:tt)+) => (
173-
separated_pair_sep!($i, $separator, call!($f), $($rest)*);
173+
separated_pair_sep!($i, $separator, call!($f), $($rest)+);
174174
);
175175
);
176176

@@ -508,7 +508,7 @@ macro_rules! alt_sep (
508508
match sep!($i, $separator, $subrule!( $($args)* )) {
509509
Ok((i,o)) => Ok((i,$gen(o))),
510510
Err(Err::Error(_)) => {
511-
alt_sep!(__impl $i, $separator, $($rest)*)
511+
alt_sep!(__impl $i, $separator, $($rest)+)
512512
},
513513
Err(e) => Err(e),
514514
}

0 commit comments

Comments
 (0)