Merge pull request #726 from epage/deprecated

fix!: Remolve deprecated code

examples/custom_error.rs

@@ -1,7 +1,5 @@
 use winnow::error::AddContext;
 use winnow::error::ErrMode;
-#[allow(deprecated)]
-use winnow::error::ErrorKind;
 use winnow::error::FromExternalError;
 use winnow::error::ParserError;
 use winnow::prelude::*;
@@ -20,8 +18,7 @@ pub enum CustomError<I> {
 impl<I: Stream + Clone> ParserError<I> for CustomError<I> {
     type Inner = Self;
 
-    #[allow(deprecated)]
-    fn from_error_kind(input: &I, _: ErrorKind) -> Self {
+    fn from_input(input: &I) -> Self {
         CustomError::Winnow(input.clone())
     }
 
@@ -46,8 +43,7 @@ impl<I: Stream + Clone, E: std::error::Error + Send + Sync + 'static> FromExtern
     for CustomError<I>
 {
     #[inline]
-    #[allow(deprecated)]
-    fn from_external_error(input: &I, _: ErrorKind, e: E) -> Self {
+    fn from_external_error(input: &I, e: E) -> Self {
         CustomError::External {
             cause: Box::new(e),
             input: input.clone(),

src/ascii/mod.rs

@@ -1622,23 +1622,6 @@ where
     })
 }
 
-/// Deprecated, replaced with [`take_escaped`]
-#[deprecated(since = "0.6.4", note = "Replaced with `take_escaped`")]
-#[inline(always)]
-pub fn escaped<Input, Error, Normal, Escapable, NormalOutput, EscapableOutput>(
-    normal: Normal,
-    control_char: char,
-    escapable: Escapable,
-) -> impl Parser<Input, <Input as Stream>::Slice, Error>
-where
-    Input: StreamIsPartial + Stream + Compare<char>,
-    Normal: Parser<Input, NormalOutput, Error>,
-    Escapable: Parser<Input, EscapableOutput, Error>,
-    Error: ParserError<Input>,
-{
-    take_escaped(normal, control_char, escapable)
-}
-
 fn escaped_internal<I, Error, F, G, O1, O2, const PARTIAL: bool>(
     input: &mut I,
     normal: &mut F,