Merge pull request #683 from epage/error-cleanup

fix(error): Move from ErrMode::Convert to ErrrorConvert::convert

src/binary/bits/mod.rs

@@ -70,7 +70,7 @@ where
                 Ok(result)
             }
             Err(ErrMode::Incomplete(n)) => Err(ErrMode::Incomplete(n.map(|u| u.get() / BYTE + 1))),
-            Err(e) => Err(e.convert()),
+            Err(e) => Err(ErrorConvert::convert(e)),
         }
     })
 }
@@ -141,7 +141,7 @@ where
                     "overflow in turning needed bytes into needed bits",
                 )),
             }),
-            Err(e) => Err(e.convert()),
+            Err(e) => Err(ErrorConvert::convert(e)),
         }
     })
 }

src/error.rs

@@ -161,18 +161,18 @@ impl<E> ErrMode<E> {
         }
     }
 
-    /// Automatically converts between errors if the underlying type supports it
+    /// Deprecated, replaced with [`ErrorConvert`]
+    #[deprecated(since = "0.6.23", note = "Replaced with `ErrorConvert`")]
     pub fn convert<F>(self) -> ErrMode<F>
     where
         E: ErrorConvert<F>,
     {
-        self.map(ErrorConvert::convert)
+        ErrorConvert::convert(self)
     }
 
     /// Unwrap the mode, returning the underlying error
     ///
     /// Returns `None` for [`ErrMode::Incomplete`]
-    #[cfg_attr(debug_assertions, track_caller)]
     #[inline(always)]
     pub fn into_inner(self) -> Option<E> {
         match self {
@@ -214,6 +214,16 @@ impl<I: Stream, E: ParserError<I>> ParserError<I> for ErrMode<E> {
     }
 }
 
+impl<E1, E2> ErrorConvert<ErrMode<E2>> for ErrMode<E1>
+where
+    E1: ErrorConvert<E2>,
+{
+    #[inline(always)]
+    fn convert(self) -> ErrMode<E2> {
+        self.map(|e| e.convert())
+    }
+}
+
 impl<I, EXT, E> FromExternalError<I, EXT> for ErrMode<E>
 where
     E: FromExternalError<I, EXT>,