refactor(parser): Update signature for 'Expr::arguments'

rinja-rs · Nov 25, 2024 · cc6dd89 · cc6dd89
1 parent 29ba02c
commit cc6dd89
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/rinja_parser/src/expr.rs b/rinja_parser/src/expr.rs
@@ -11,9 +11,9 @@ use winnow::stream::Stream as _;
 use winnow::{Parser, unpeek};
 
 use crate::{
-    CharLit, ErrorContext, InputParseResult, Level, Num, ParseErr, ParseResult, PathOrIdentifier,
-    Span, StrLit, WithSpan, char_lit, filter, identifier, keyword, num_lit, path_or_identifier,
-    skip_ws0, skip_ws1, str_lit, ws,
+    CharLit, ErrorContext, Level, Num, ParseErr, ParseResult, PathOrIdentifier, Span, StrLit,
+    WithSpan, char_lit, filter, identifier, keyword, num_lit, path_or_identifier, skip_ws0,
+    skip_ws1, str_lit, ws,
 };
 
 macro_rules! expr_prec_layer {
@@ -132,13 +132,13 @@ pub enum Expr<'a> {
 
 impl<'a> Expr<'a> {
     pub(super) fn arguments(
-        i: &'a str,
+        i: &mut &'a str,
         level: Level,
         is_template_macro: bool,
-    ) -> InputParseResult<'a, Vec<WithSpan<'a, Self>>> {
+    ) -> ParseResult<'a, Vec<WithSpan<'a, Self>>> {
         let level = level.nest(i)?;
         let mut named_arguments = HashSet::new();
-        let start = i;
+        let start = *i;
 
         preceded(
             ws('('),
@@ -177,7 +177,7 @@ impl<'a> Expr<'a> {
                 (opt(ws(',')), ')'),
             )),
         )
-        .parse_peek(i)
+        .parse_next(i)
     }
 
     fn named_argument(
@@ -673,7 +673,7 @@ impl<'a> Suffix<'a> {
 
     fn call(i: &mut &'a str, level: Level) -> ParseResult<'a, Self> {
         let level = level.nest(i)?;
-        unpeek(move |i| Expr::arguments(i, level, false))
+        (move |i: &mut _| Expr::arguments(i, level, false))
             .map(Self::Call)
             .parse_next(i)
     }

diff --git a/rinja_parser/src/lib.rs b/rinja_parser/src/lib.rs
@@ -979,7 +979,7 @@ fn filter<'a>(
     *level = level.nest(start)?;
     cut_err((
         ws(identifier),
-        opt(unpeek(|i| Expr::arguments(i, *level, false))),
+        opt(|i: &mut _| Expr::arguments(i, *level, false)),
     ))
     .parse_next(i)
 }

diff --git a/rinja_parser/src/node.rs b/rinja_parser/src/node.rs
@@ -782,7 +782,7 @@ impl<'a> FilterBlock<'a> {
                 Some("filter"),
                 (
                     ws(identifier),
-                    opt(unpeek(|i| Expr::arguments(i, s.level.get(), false))),
+                    opt(|i: &mut _| Expr::arguments(i, s.level.get(), false)),
                     repeat(0.., |i: &mut _| {
                         let start = *i;
                         filter(i, &mut level).map(|(name, params)| (name, params, start))
@@ -905,9 +905,9 @@ impl<'a> Call<'a> {
                 (
                     opt((ws(identifier), ws("::"))),
                     ws(identifier),
-                    opt(ws(unpeek(|nested| {
+                    opt(ws(|nested: &mut _| {
                         Expr::arguments(nested, s.level.get(), true)
-                    }))),
+                    })),
                     opt(unpeek(Whitespace::parse)),
                 ),
             ),