Simplify error creation

Ed Page committed 3 years ago

Commit bdcd3791 parent 42ae7661 file · +13 −40Browse files

Unified · Split

     combinator::delimited,
     combinator::fold_repeat,
     combinator::opt,
-    error::{ErrorKind, InputError as NomError},
+    error::{ErrorKind, InputError as NomError, ParserError as _},
     prelude::*,
     stream::AsChar,
     token::{one_of, take_till0, take_while},
         };
         if header.name.is_empty() {
-            return Err(winnow::error::ErrMode::Backtrack(NomError {
+            return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Fail));
-                input: i,
-                kind: ErrorKind::Fail,
-            }));
         }
         return Ok((i, header));
     }
     while let Some(mut b) = bytes.next() {
         cursor += 1;
         if b == b'\n' || b == 0 {
-            return Err(winnow::error::ErrMode::Backtrack(NomError {
+            return Err(winnow::error::ErrMode::from_error_kind(&i[cursor..], ErrorKind::Fail));
-                input: &i[cursor..],
-                kind: ErrorKind::Fail,
-            }));
         }
         if b == b'"' {
             found_terminator = true;
             break;
         }
         if b == b'\\' {
-            b = bytes.next().ok_or_else(|| {
+            b = bytes
-                winnow::error::ErrMode::Backtrack(NomError {
+                .next()
-                    input: &i[cursor..],
+                .ok_or_else(|| winnow::error::ErrMode::from_error_kind(&i[cursor..], ErrorKind::Fail))?;
-                    kind: ErrorKind::Fail,
-                })
-            })?;
             found_escape = true;
             cursor += 1;
             if b == b'\n' {
-                return Err(winnow::error::ErrMode::Backtrack(NomError {
+                return Err(winnow::error::ErrMode::from_error_kind(&i[cursor..], ErrorKind::Fail));
-                    input: &i[cursor..],
-                    kind: ErrorKind::Fail,
-                }));
             }
         }
         push_byte(b);
     }
     if !found_terminator {
-        return Err(winnow::error::ErrMode::Backtrack(NomError {
+        return Err(winnow::error::ErrMode::from_error_kind(&i[cursor..], ErrorKind::Fail));
-            input: &i[cursor..],
-            kind: ErrorKind::Fail,
-        }));
     }
     Ok((&i[cursor - 1..], (found_escape, cursor - 1)))
 /// trimmed of any leading whitespace.
 fn config_name(i: &[u8]) -> IResult<&[u8], &BStr> {
     if i.is_empty() {
-        return Err(winnow::error::ErrMode::Backtrack(NomError {
+        return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Fail));
-            input: i,
-            kind: ErrorKind::Fail,
-        }));
     }
     if !i[0].is_ascii_alphabetic() {
-        return Err(winnow::error::ErrMode::Backtrack(NomError {
+        return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Token));
-            input: i,
-            kind: ErrorKind::Token,
-        }));
     }
     let (i, name) = take_while(0.., |c: u8| c.is_ascii_alphanumeric() || c == b'-').parse_next(i)?;
 /// line values as well as values that are continuations.
 fn value_impl<'a>(i: &'a [u8], dispatch: &mut impl FnMut(Event<'a>)) -> IResult<&'a [u8], usize> {
     let (i, value_end, newlines, mut dispatch) = {
-        let new_err = |kind| winnow::error::ErrMode::Backtrack(NomError { input: i, kind });
+        let new_err = |kind| winnow::error::ErrMode::from_error_kind(i, kind);
         let mut value_end = None::<usize>;
         let mut value_start: usize = 0;
         let mut newlines = 0;
 fn take_spaces(i: &[u8]) -> IResult<&[u8], &BStr> {
     let (i, v) = take_while(0.., |c: u8| c.is_ascii() && c.is_space()).parse_next(i)?;
     if v.is_empty() {
-        Err(winnow::error::ErrMode::Backtrack(NomError {
+        Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Eof))
-            input: i,
-            kind: ErrorKind::Eof,
-        }))
     } else {
         Ok((i, v.as_bstr()))
     }
     }
     let (v, i) = i.split_at(consumed_bytes);
     if v.is_empty() {
-        Err(winnow::error::ErrMode::Backtrack(NomError {
+        Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Eof))
-            input: i,
-            kind: ErrorKind::Eof,
-        }))
     } else {
         Ok((i, (v.as_bstr(), counter)))
     }