Merge pull request #775 from epage/perf

perf(parser): Resolve regression from stackoverflow protect
toml-rs · Jul 31, 2024 · d0f242b · d0f242b
2 parents a3ce25e + c7efee7
commit d0f242b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml
@@ -41,7 +41,7 @@ unbounded = []
 
 [dependencies]
 indexmap = { version = "2.0.0", features = ["std"] }
-winnow = { version = "0.6.17", optional = true }
+winnow = { version = "0.6.18", optional = true }
 serde = { version = "1.0.145", optional = true }
 kstring = { version = "2.0.0", features = ["max_inline"], optional = true }
 toml_datetime = { version = "0.6.8", path = "../toml_datetime" }

diff --git a/crates/toml_edit/src/parser/trivia.rs b/crates/toml_edit/src/parser/trivia.rs
@@ -96,13 +96,13 @@ pub(crate) fn ws_comment_newline(input: &mut Input<'_>) -> PResult<()> {
     loop {
         let _ = ws.parse_next(input)?;
 
-        dispatch! {opt(peek(any));
-            Some(b'#') => (comment, newline).void(),
-            Some(b'\n') => (newline).void(),
-            Some(b'\r') => (newline).void(),
-            _ => empty,
+        let next_token = opt(peek(any)).parse_next(input)?;
+        match next_token {
+            Some(b'#') => (comment, newline).void().parse_next(input)?,
+            Some(b'\n') => (newline).void().parse_next(input)?,
+            Some(b'\r') => (newline).void().parse_next(input)?,
+            _ => break,
         }
-        .parse_next(input)?;
 
         let end = input.checkpoint();
         if start == end {