Merge pull request #678 from epage/till

refactor: Clean up ErrMode logic
winnow-rs · Jan 8, 2025 · 826cf95 · 826cf95
2 parents 7e32086 + df54e83
commit 826cf95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/ascii/mod.rs b/src/ascii/mod.rs
@@ -178,12 +178,12 @@ where
     I: FindSlice<(char, char)>,
     <I as Stream>::Token: AsChar + Clone,
 {
-    let res = match take_until::<_, _, ()>(0.., ('\r', '\n')).parse_next(input) {
+    let res = match take_until(0.., ('\r', '\n')).parse_next(input) {
         Ok(slice) => slice,
-        Err(ErrMode::Incomplete(err)) => {
-            return Err(ErrMode::Incomplete(err));
+        Err(ErrMode::Backtrack(_)) => input.finish(),
+        Err(err) => {
+            return Err(err);
         }
-        Err(_) => input.finish(),
     };
     if matches!(input.compare("\r"), CompareResult::Ok(_)) {
         let comp = input.compare("\r\n");

diff --git a/src/combinator/impls.rs b/src/combinator/impls.rs
@@ -542,12 +542,9 @@ where
 {
     #[inline]
     fn parse_next(&mut self, i: &mut I) -> PResult<O, E2> {
-        match self.parser.parse_next(i) {
-            Ok(ok) => Ok(ok),
-            Err(ErrMode::Backtrack(e)) => Err(ErrMode::Backtrack(e.into())),
-            Err(ErrMode::Cut(e)) => Err(ErrMode::Cut(e.into())),
-            Err(ErrMode::Incomplete(e)) => Err(ErrMode::Incomplete(e)),
-        }
+        self.parser
+            .parse_next(i)
+            .map_err(|err| err.map(|e| e.into()))
     }
 }