Bump winnow (#3822)

.github/workflows/cargo-clippy.yml

@@ -28,6 +28,7 @@ jobs:
         dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@just
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
@@ -41,7 +42,7 @@ jobs:
       - name: Run clippy
         run: |
           cd "${{ matrix.dir }}"
-          cargo clippy --all --tests --benches -- -D warnings
+          just lint
       # If this fails, run "cargo check" to update Cargo.lock,
       # then add Cargo.lock to the PR.
       - name: Check Cargo.lock doesn't need updating

src/wasm-lib/Cargo.lock

@@ -1399,7 +1399,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winnow 0.5.40",
+ "winnow",
  "zip",
 ]
 
@@ -3117,7 +3117,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow",
 ]
 
 [[package]]
@@ -3800,15 +3800,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.18"

src/wasm-lib/justfile

@@ -2,3 +2,6 @@
 new-test name:
     echo "kcl_test!(\"{{name}}\", {{name}});" >> tests/executor/visuals.rs
     TWENTY_TWENTY=overwrite cargo nextest run --test executor -E 'test(=visuals::{{name}})'
+
+lint:
+    cargo clippy --all --tests --benches -- -D warnings

src/wasm-lib/kcl/Cargo.toml

@@ -47,7 +47,7 @@ url = { version = "2.5.2", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.10.0", features = ["v4", "js", "serde"] }
 validator = { version = "0.18.1", features = ["derive"] }
-winnow = "0.5.40"
+winnow = "0.6.18"
 zip = { version = "2.0.0", default-features = false }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

src/wasm-lib/kcl/src/parser/parser_impl.rs

@@ -927,7 +927,7 @@ pub fn function_body(i: TokenSlice) -> PResult<Program> {
 
                 match body_items_within_function.parse_next(i) {
                     Err(ErrMode::Backtrack(_)) => {
-                        i.reset(start);
+                        i.reset(&start);
                         break;
                     }
                     Err(e) => return Err(e),
@@ -937,7 +937,7 @@ pub fn function_body(i: TokenSlice) -> PResult<Program> {
                 }
             }
             (Err(ErrMode::Backtrack(_)), _) => {
-                i.reset(start);
+                i.reset(&start);
                 break;
             }
             (Err(e), _) => return Err(e),
@@ -1276,7 +1276,7 @@ fn unary_expression(i: TokenSlice) -> PResult<UnaryExpression> {
 
 /// Consume tokens that make up a binary expression, but don't actually return them.
 /// Why not?
-/// Because this is designed to be used with .recognize() within the `binary_expression` parser.
+/// Because this is designed to be used with .take() within the `binary_expression` parser.
 fn binary_expression_tokens(i: TokenSlice) -> PResult<Vec<BinaryExpressionToken>> {
     let first = operand.parse_next(i).map(BinaryExpressionToken::from)?;
     let remaining: Vec<_> = repeat(
@@ -1308,7 +1308,7 @@ fn binary_expression(i: TokenSlice) -> PResult<BinaryExpression> {
 }
 
 fn binary_expr_in_parens(i: TokenSlice) -> PResult<BinaryExpression> {
-    let span_with_brackets = bracketed_section.recognize().parse_next(i)?;
+    let span_with_brackets = bracketed_section.take().parse_next(i)?;
     let n = span_with_brackets.len();
     let mut span_no_brackets = &span_with_brackets[1..n - 1];
     let expr = binary_expression.parse_next(&mut span_no_brackets)?;

src/wasm-lib/kcl/src/parser/parser_impl/error.rs

@@ -1,5 +1,6 @@
 use winnow::{
     error::{ErrorKind, ParseError, StrContext},
+    stream::Stream,
     Located,
 };
 
@@ -102,14 +103,17 @@ impl<C> std::default::Default for ContextError<C> {
     }
 }
 
-impl<I, C> winnow::error::ParserError<I> for ContextError<C> {
+impl<I, C> winnow::error::ParserError<I> for ContextError<C>
+where
+    I: Stream,
+{
     #[inline]
     fn from_error_kind(_input: &I, _kind: ErrorKind) -> Self {
         Self::default()
     }
 
     #[inline]
-    fn append(self, _input: &I, _kind: ErrorKind) -> Self {
+    fn append(self, _input: &I, _input_checkpoint: &<I as Stream>::Checkpoint, _kind: ErrorKind) -> Self {
         self
     }
 
@@ -119,9 +123,12 @@ impl<I, C> winnow::error::ParserError<I> for ContextError<C> {
     }
 }
 
-impl<C, I> winnow::error::AddContext<I, C> for ContextError<C> {
+impl<C, I> winnow::error::AddContext<I, C> for ContextError<C>
+where
+    I: Stream,
+{
     #[inline]
-    fn add_context(mut self, _input: &I, ctx: C) -> Self {
+    fn add_context(mut self, _input: &I, _input_checkpoint: &<I as Stream>::Checkpoint, ctx: C) -> Self {
         self.context.push(ctx);
         self
     }

src/wasm-lib/kcl/src/token/tokeniser.rs

@@ -50,13 +50,13 @@ pub fn token(i: &mut Located<&str>) -> PResult<Token> {
 }
 
 fn block_comment(i: &mut Located<&str>) -> PResult<Token> {
-    let inner = ("/*", take_until(0.., "*/"), "*/").recognize();
+    let inner = ("/*", take_until(0.., "*/"), "*/").take();
     let (value, range) = inner.with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::BlockComment, value.to_string()))
 }
 
 fn line_comment(i: &mut Located<&str>) -> PResult<Token> {
-    let inner = (r#"//"#, take_till(0.., ['\n', '\r'])).recognize();
+    let inner = (r#"//"#, take_till(0.., ['\n', '\r'])).take();
     let (value, range) = inner.with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::LineComment, value.to_string()))
 }
@@ -68,7 +68,7 @@ fn number(i: &mut Located<&str>) -> PResult<Token> {
         // No digits before the decimal point.
         ('.', digit1).map(|_| ()),
     ));
-    let (value, range) = number_parser.recognize().with_span().parse_next(i)?;
+    let (value, range) = number_parser.take().with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::Number, value.to_string()))
 }
 
@@ -84,7 +84,7 @@ fn inner_word(i: &mut Located<&str>) -> PResult<()> {
 }
 
 fn word(i: &mut Located<&str>) -> PResult<Token> {
-    let (value, range) = inner_word.recognize().with_span().parse_next(i)?;
+    let (value, range) = inner_word.take().with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::Word, value.to_string()))
 }
 
@@ -162,9 +162,9 @@ fn inner_single_quote(i: &mut Located<&str>) -> PResult<()> {
 }
 
 fn string(i: &mut Located<&str>) -> PResult<Token> {
-    let single_quoted_string = ('\'', inner_single_quote.recognize(), '\'');
-    let double_quoted_string = ('"', inner_double_quote.recognize(), '"');
-    let either_quoted_string = alt((single_quoted_string.recognize(), double_quoted_string.recognize()));
+    let single_quoted_string = ('\'', inner_single_quote.take(), '\'');
+    let double_quoted_string = ('"', inner_double_quote.take(), '"');
+    let either_quoted_string = alt((single_quoted_string.take(), double_quoted_string.take()));
     let (value, range): (&str, _) = either_quoted_string.with_span().parse_next(i)?;
     Ok(Token::from_range(range, TokenType::String, value.to_string()))
 }