Merge pull request #705 from epage/error

feat(error): Add inherent ParserError::append
winnow-rs · Jan 22, 2025 · 499722c · 499722c
2 parents 22862c5 + 9bc062d
commit 499722c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 56 deletions.
diff --git a/examples/custom_error.rs b/examples/custom_error.rs
@@ -21,10 +21,6 @@ impl<I: Stream + Clone> ParserError<I> for CustomError<I> {
     fn from_error_kind(input: &I, kind: ErrorKind) -> Self {
         CustomError::Winnow(input.clone(), kind)
     }
-
-    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> Self {
-        self
-    }
 }
 
 impl<C, I: Stream> AddContext<I, C> for CustomError<I> {

diff --git a/src/combinator/tests.rs b/src/combinator/tests.rs
@@ -122,10 +122,6 @@ impl<I: Stream> ParserError<I> for CustomError {
     fn from_error_kind(_: &I, _: ErrorKind) -> Self {
         CustomError
     }
-
-    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> Self {
-        CustomError
-    }
 }
 
 struct CustomError;
@@ -3464,9 +3460,6 @@ impl<I: Stream> ParserError<I> for NilError {
     fn from_error_kind(_: &I, _: ErrorKind) -> NilError {
         NilError
     }
-    fn append(self, _: &I, _: &<I as Stream>::Checkpoint, _: ErrorKind) -> NilError {
-        NilError
-    }
 }
 
 #[test]

diff --git a/src/error.rs b/src/error.rs
@@ -294,7 +294,15 @@ pub trait ParserError<I: Stream>: Sized {
     ///
     /// This is useful when backtracking through a parse tree, accumulating error context on the
     /// way.
-    fn append(self, input: &I, token_start: &<I as Stream>::Checkpoint, kind: ErrorKind) -> Self;
+    #[inline]
+    fn append(
+        self,
+        _input: &I,
+        _token_start: &<I as Stream>::Checkpoint,
+        _kind: ErrorKind,
+    ) -> Self {
+        self
+    }
 
     /// Combines errors from two different parse branches.
     ///
@@ -407,16 +415,6 @@ impl<I: Stream + Clone> ParserError<I> for InputError<I> {
             kind,
         }
     }
-
-    #[inline]
-    fn append(
-        self,
-        _input: &I,
-        _token_start: &<I as Stream>::Checkpoint,
-        _kind: ErrorKind,
-    ) -> Self {
-        self
-    }
 }
 
 impl<I: Stream + Clone, C> AddContext<I, C> for InputError<I> {}
@@ -487,15 +485,6 @@ impl<I: Clone + fmt::Debug + fmt::Display + Sync + Send + 'static> std::error::E
 impl<I: Stream> ParserError<I> for () {
     #[inline]
     fn from_error_kind(_: &I, _: ErrorKind) -> Self {}
-
-    #[inline]
-    fn append(
-        self,
-        _input: &I,
-        _token_start: &<I as Stream>::Checkpoint,
-        _kind: ErrorKind,
-    ) -> Self {
-    }
 }
 
 impl<I: Stream, C> AddContext<I, C> for () {}
@@ -582,21 +571,6 @@ impl<I: Stream, C> ParserError<I> for ContextError<C> {
     fn from_error_kind(_input: &I, _kind: ErrorKind) -> Self {
         Self::new()
     }
-
-    #[inline]
-    fn append(
-        self,
-        _input: &I,
-        _token_start: &<I as Stream>::Checkpoint,
-        _kind: ErrorKind,
-    ) -> Self {
-        self
-    }
-
-    #[inline]
-    fn or(self, other: Self) -> Self {
-        other
-    }
 }
 
 impl<C, I: Stream> AddContext<I, C> for ContextError<C> {
@@ -1134,16 +1108,6 @@ impl<I: Stream> ParserError<I> for ErrorKind {
     fn from_error_kind(_input: &I, kind: ErrorKind) -> Self {
         kind
     }
-
-    #[inline]
-    fn append(
-        self,
-        _input: &I,
-        _token_start: &<I as Stream>::Checkpoint,
-        _kind: ErrorKind,
-    ) -> Self {
-        self
-    }
 }
 
 impl<I: Stream, C> AddContext<I, C> for ErrorKind {}