diff --git a/Cargo.lock b/Cargo.lock
index bdfdef1a..4a332d99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1248,9 +1248,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.9"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"
+checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
 dependencies = [
  "memchr",
 ]
diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml
index b51d2fc5..f7356616 100644
--- a/crates/toml_edit/Cargo.toml
+++ b/crates/toml_edit/Cargo.toml
@@ -38,7 +38,7 @@ unbounded = []
 
 [dependencies]
 indexmap = { version = "2.0.0", features = ["std"] }
-winnow = "0.4.9"
+winnow = "0.5.0"
 serde = { version = "1.0.145", optional = true }
 kstring = { version = "2.0.0", features = ["max_inline"], optional = true }
 toml_datetime = { version = "0.6.3", path = "../toml_datetime" }
diff --git a/crates/toml_edit/src/parser/array.rs b/crates/toml_edit/src/parser/array.rs
index f37191d2..e3b1f3f5 100644
--- a/crates/toml_edit/src/parser/array.rs
+++ b/crates/toml_edit/src/parser/array.rs
@@ -13,8 +13,8 @@ use crate::parser::prelude::*;
 // ;; Array
 
 // array = array-open array-values array-close
-pub(crate) fn array<'i>(check: RecursionCheck) -> impl Parser<Input<'i>, Array, ContextError<'i>> {
-    trace("array", move |input| {
+pub(crate) fn array<'i>(check: RecursionCheck) -> impl Parser<Input<'i>, Array, ContextError> {
+    trace("array", move |input: &mut Input<'i>| {
         delimited(
             ARRAY_OPEN,
             cut_err(array_values(check)),
@@ -40,8 +40,8 @@ const ARRAY_SEP: u8 = b',';
 //                  array-value / ws-comment-newline ]
 pub(crate) fn array_values<'i>(
     check: RecursionCheck,
-) -> impl Parser<Input<'i>, Array, ContextError<'i>> {
-    move |input| {
+) -> impl Parser<Input<'i>, Array, ContextError> {
+    move |input: &mut Input<'i>| {
         let check = check.recursing(input)?;
         (
             opt(
@@ -68,8 +68,8 @@ pub(crate) fn array_values<'i>(
 
 pub(crate) fn array_value<'i>(
     check: RecursionCheck,
-) -> impl Parser<Input<'i>, Value, ContextError<'i>> {
-    move |input| {
+) -> impl Parser<Input<'i>, Value, ContextError> {
+    move |input: &mut Input<'i>| {
         (
             ws_comment_newline.span(),
             value(check),
diff --git a/crates/toml_edit/src/parser/datetime.rs b/crates/toml_edit/src/parser/datetime.rs
index 0ab7ca22..6e89b977 100644
--- a/crates/toml_edit/src/parser/datetime.rs
+++ b/crates/toml_edit/src/parser/datetime.rs
@@ -21,7 +21,7 @@ use winnow::trace::trace;
 // local-date = full-date
 // local-time = partial-time
 // full-time = partial-time time-offset
-pub(crate) fn date_time(input: Input<'_>) -> IResult<Input<'_>, Datetime, ContextError<'_>> {
+pub(crate) fn date_time(input: &mut Input<'_>) -> PResult<Datetime> {
     trace(
         "date-time",
         alt((
@@ -52,7 +52,7 @@ pub(crate) fn date_time(input: Input<'_>) -> IResult<Input<'_>, Datetime, Contex
 }
 
 // full-date      = date-fullyear "-" date-month "-" date-mday
-pub(crate) fn full_date(input: Input<'_>) -> IResult<Input<'_>, Date, ContextError<'_>> {
+pub(crate) fn full_date(input: &mut Input<'_>) -> PResult<Date> {
     trace(
         "full-date",
         (date_fullyear, b'-', cut_err((date_month, b'-', date_mday)))
@@ -62,7 +62,7 @@ pub(crate) fn full_date(input: Input<'_>) -> IResult<Input<'_>, Date, ContextErr
 }
 
 // partial-time   = time-hour ":" time-minute ":" time-second [time-secfrac]
-pub(crate) fn partial_time(input: Input<'_>) -> IResult<Input<'_>, Time, ContextError<'_>> {
+pub(crate) fn partial_time(input: &mut Input<'_>) -> PResult<Time> {
     trace(
         "partial-time",
         (
@@ -82,7 +82,7 @@ pub(crate) fn partial_time(input: Input<'_>) -> IResult<Input<'_>, Time, Context
 
 // time-offset    = "Z" / time-numoffset
 // time-numoffset = ( "+" / "-" ) time-hour ":" time-minute
-pub(crate) fn time_offset(input: Input<'_>) -> IResult<Input<'_>, Offset, ContextError<'_>> {
+pub(crate) fn time_offset(input: &mut Input<'_>) -> PResult<Offset> {
     trace(
         "time-offset",
         alt((
@@ -108,14 +108,14 @@ pub(crate) fn time_offset(input: Input<'_>) -> IResult<Input<'_>, Offset, Contex
 }
 
 // date-fullyear  = 4DIGIT
-pub(crate) fn date_fullyear(input: Input<'_>) -> IResult<Input<'_>, u16, ContextError<'_>> {
+pub(crate) fn date_fullyear(input: &mut Input<'_>) -> PResult<u16> {
     unsigned_digits::<4, 4>
         .map(|s: &str| s.parse::<u16>().expect("4DIGIT should match u8"))
         .parse_next(input)
 }
 
 // date-month     = 2DIGIT  ; 01-12
-pub(crate) fn date_month(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn date_month(input: &mut Input<'_>) -> PResult<u8> {
     unsigned_digits::<2, 2>
         .try_map(|s: &str| {
             let d = s.parse::<u8>().expect("2DIGIT should match u8");
@@ -129,7 +129,7 @@ pub(crate) fn date_month(input: Input<'_>) -> IResult<Input<'_>, u8, ContextErro
 }
 
 // date-mday      = 2DIGIT  ; 01-28, 01-29, 01-30, 01-31 based on month/year
-pub(crate) fn date_mday(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn date_mday(input: &mut Input<'_>) -> PResult<u8> {
     unsigned_digits::<2, 2>
         .try_map(|s: &str| {
             let d = s.parse::<u8>().expect("2DIGIT should match u8");
@@ -143,14 +143,14 @@ pub(crate) fn date_mday(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError
 }
 
 // time-delim     = "T" / %x20 ; T, t, or space
-pub(crate) fn time_delim(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn time_delim(input: &mut Input<'_>) -> PResult<u8> {
     one_of(TIME_DELIM).parse_next(input)
 }
 
 const TIME_DELIM: (u8, u8, u8) = (b'T', b't', b' ');
 
 // time-hour      = 2DIGIT  ; 00-23
-pub(crate) fn time_hour(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn time_hour(input: &mut Input<'_>) -> PResult<u8> {
     unsigned_digits::<2, 2>
         .try_map(|s: &str| {
             let d = s.parse::<u8>().expect("2DIGIT should match u8");
@@ -164,7 +164,7 @@ pub(crate) fn time_hour(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError
 }
 
 // time-minute    = 2DIGIT  ; 00-59
-pub(crate) fn time_minute(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn time_minute(input: &mut Input<'_>) -> PResult<u8> {
     unsigned_digits::<2, 2>
         .try_map(|s: &str| {
             let d = s.parse::<u8>().expect("2DIGIT should match u8");
@@ -178,7 +178,7 @@ pub(crate) fn time_minute(input: Input<'_>) -> IResult<Input<'_>, u8, ContextErr
 }
 
 // time-second    = 2DIGIT  ; 00-58, 00-59, 00-60 based on leap second rules
-pub(crate) fn time_second(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn time_second(input: &mut Input<'_>) -> PResult<u8> {
     unsigned_digits::<2, 2>
         .try_map(|s: &str| {
             let d = s.parse::<u8>().expect("2DIGIT should match u8");
@@ -192,7 +192,7 @@ pub(crate) fn time_second(input: Input<'_>) -> IResult<Input<'_>, u8, ContextErr
 }
 
 // time-secfrac   = "." 1*DIGIT
-pub(crate) fn time_secfrac(input: Input<'_>) -> IResult<Input<'_>, u32, ContextError<'_>> {
+pub(crate) fn time_secfrac(input: &mut Input<'_>) -> PResult<u32> {
     static SCALE: [u32; 10] = [
         0,
         100_000_000,
@@ -227,9 +227,9 @@ pub(crate) fn time_secfrac(input: Input<'_>) -> IResult<Input<'_>, u32, ContextE
         .parse_next(input)
 }
 
-pub(crate) fn unsigned_digits<const MIN: usize, const MAX: usize>(
-    input: Input<'_>,
-) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn unsigned_digits<'i, const MIN: usize, const MAX: usize>(
+    input: &mut Input<'i>,
+) -> PResult<&'i str> {
     take_while(MIN..=MAX, DIGIT)
         .map(|b: &[u8]| unsafe { from_utf8_unchecked(b, "`is_ascii_digit` filters out on-ASCII") })
         .parse_next(input)
diff --git a/crates/toml_edit/src/parser/document.rs b/crates/toml_edit/src/parser/document.rs
index 32061b3f..aa8fb115 100644
--- a/crates/toml_edit/src/parser/document.rs
+++ b/crates/toml_edit/src/parser/document.rs
@@ -30,11 +30,11 @@ use crate::RawString;
 //                ( ws keyval ws [ comment ] ) /
 //                ( ws table ws [ comment ] ) /
 //                  ws )
-pub(crate) fn document(input: Input<'_>) -> IResult<Input<'_>, Document, ContextError<'_>> {
+pub(crate) fn document(input: &mut Input<'_>) -> PResult<Document> {
     let state = RefCell::new(ParseState::default());
     let state_ref = &state;
 
-    let (i, _o) = (
+    let _o = (
         // Remove BOM if present
         opt(b"\xEF\xBB\xBF"),
         parse_ws(state_ref),
@@ -52,19 +52,15 @@ pub(crate) fn document(input: Input<'_>) -> IResult<Input<'_>, Document, Context
         eof,
     )
         .parse_next(input)?;
-    state
-        .into_inner()
-        .into_document()
-        .map(|document| (i, document))
-        .map_err(|err| {
-            winnow::error::ErrMode::from_external_error(i, winnow::error::ErrorKind::Verify, err)
-        })
+    state.into_inner().into_document().map_err(|err| {
+        winnow::error::ErrMode::from_external_error(input, winnow::error::ErrorKind::Verify, err)
+    })
 }
 
 pub(crate) fn parse_comment<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         (comment, line_ending)
             .span()
             .map(|span| {
@@ -76,8 +72,8 @@ pub(crate) fn parse_comment<'s, 'i>(
 
 pub(crate) fn parse_ws<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         ws.span()
             .map(|span| state.borrow_mut().on_ws(span))
             .parse_next(i)
@@ -86,8 +82,8 @@ pub(crate) fn parse_ws<'s, 'i>(
 
 pub(crate) fn parse_newline<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         newline
             .span()
             .map(|span| state.borrow_mut().on_ws(span))
@@ -97,8 +93,8 @@ pub(crate) fn parse_newline<'s, 'i>(
 
 pub(crate) fn keyval<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         parse_keyval
             .try_map(|(p, kv)| state.borrow_mut().on_keyval(p, kv))
             .parse_next(i)
@@ -106,9 +102,7 @@ pub(crate) fn keyval<'s, 'i>(
 }
 
 // keyval = key keyval-sep val
-pub(crate) fn parse_keyval(
-    input: Input<'_>,
-) -> IResult<Input<'_>, (Vec<Key>, TableKeyValue), ContextError<'_>> {
+pub(crate) fn parse_keyval(input: &mut Input<'_>) -> PResult<(Vec<Key>, TableKeyValue)> {
     trace(
         "keyval",
         (
diff --git a/crates/toml_edit/src/parser/errors.rs b/crates/toml_edit/src/parser/errors.rs
index 4ba7565b..859ed533 100644
--- a/crates/toml_edit/src/parser/errors.rs
+++ b/crates/toml_edit/src/parser/errors.rs
@@ -4,7 +4,8 @@ use std::fmt::{Display, Formatter, Result};
 use crate::parser::prelude::*;
 use crate::Key;
 
-use winnow::BStr;
+use winnow::error::ContextError;
+use winnow::error::ParseError;
 
 /// Type representing a TOML parse error
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
@@ -16,19 +17,18 @@ pub struct TomlError {
 }
 
 impl TomlError {
-    pub(crate) fn new(error: ContextError<'_>, original: Input<'_>) -> Self {
-        use winnow::stream::Offset;
+    pub(crate) fn new(error: ParseError<Input<'_>, ContextError>, mut original: Input<'_>) -> Self {
         use winnow::stream::Stream;
 
-        let offset = error.input.offset_from(&original);
+        let offset = error.offset();
         let span = if offset == original.len() {
             offset..offset
         } else {
             offset..(offset + 1)
         };
 
-        let message = error.to_string();
-        let original = original.next_slice(original.eof_offset()).1;
+        let message = error.inner().to_string();
+        let original = original.finish();
 
         Self {
             message,
@@ -146,166 +146,6 @@ impl StdError for TomlError {
     }
 }
 
-#[derive(Debug)]
-pub(crate) struct ContextError<'b> {
-    input: Input<'b>,
-    context: Vec<StrContext>,
-    cause: Option<Box<dyn std::error::Error + Send + Sync + 'static>>,
-}
-
-impl<'b> winnow::error::ParserError<Input<'b>> for ContextError<'b> {
-    fn from_error_kind(input: Input<'b>, _kind: winnow::error::ErrorKind) -> Self {
-        Self {
-            input,
-            context: Default::default(),
-            cause: Default::default(),
-        }
-    }
-
-    fn append(self, _input: Input<'b>, _kind: winnow::error::ErrorKind) -> Self {
-        self
-    }
-
-    fn or(self, other: Self) -> Self {
-        other
-    }
-}
-
-impl<'b> winnow::error::ParserError<&'b str> for ContextError<'b> {
-    fn from_error_kind(input: &'b str, _kind: winnow::error::ErrorKind) -> Self {
-        Self {
-            input: Input::new(BStr::new(input)),
-            context: Default::default(),
-            cause: Default::default(),
-        }
-    }
-
-    fn append(self, _input: &'b str, _kind: winnow::error::ErrorKind) -> Self {
-        self
-    }
-
-    fn or(self, other: Self) -> Self {
-        other
-    }
-}
-
-impl<'b> winnow::error::AddContext<Input<'b>, StrContext> for ContextError<'b> {
-    fn add_context(mut self, _input: Input<'b>, ctx: StrContext) -> Self {
-        self.context.push(ctx);
-        self
-    }
-}
-
-impl<'b, E: std::error::Error + Send + Sync + 'static>
-    winnow::error::FromExternalError<Input<'b>, E> for ContextError<'b>
-{
-    fn from_external_error(input: Input<'b>, _kind: winnow::error::ErrorKind, e: E) -> Self {
-        Self {
-            input,
-            context: Default::default(),
-            cause: Some(Box::new(e)),
-        }
-    }
-}
-
-impl<'b, E: std::error::Error + Send + Sync + 'static> winnow::error::FromExternalError<&'b str, E>
-    for ContextError<'b>
-{
-    fn from_external_error(input: &'b str, _kind: winnow::error::ErrorKind, e: E) -> Self {
-        Self {
-            input: Input::new(BStr::new(input)),
-            context: Default::default(),
-            cause: Some(Box::new(e)),
-        }
-    }
-}
-
-// For tests
-impl<'b> std::cmp::PartialEq for ContextError<'b> {
-    fn eq(&self, other: &Self) -> bool {
-        self.input == other.input
-            && self.context == other.context
-            && self.cause.as_ref().map(ToString::to_string)
-                == other.cause.as_ref().map(ToString::to_string)
-    }
-}
-
-impl<'a> std::fmt::Display for ContextError<'a> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let expression = self.context.iter().find_map(|c| match c {
-            StrContext::Label(c) => Some(c),
-            _ => None,
-        });
-        let expected = self
-            .context
-            .iter()
-            .filter_map(|c| match c {
-                StrContext::Expected(c) => Some(c),
-                _ => None,
-            })
-            .collect::<Vec<_>>();
-
-        let mut newline = false;
-
-        if let Some(expression) = expression {
-            newline = true;
-
-            write!(f, "invalid {}", expression)?;
-        }
-
-        if !expected.is_empty() {
-            if newline {
-                writeln!(f)?;
-            }
-            newline = true;
-
-            write!(f, "expected ")?;
-            for (i, expected) in expected.iter().enumerate() {
-                if i != 0 {
-                    write!(f, ", ")?;
-                }
-                write!(f, "{}", expected)?;
-            }
-        }
-        if let Some(cause) = &self.cause {
-            if newline {
-                writeln!(f)?;
-            }
-            write!(f, "{}", cause)?;
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub(crate) enum StrContext {
-    Label(&'static str),
-    Expected(StrContextValue),
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub(crate) enum StrContextValue {
-    CharLiteral(char),
-    StringLiteral(&'static str),
-    Description(&'static str),
-}
-
-impl std::fmt::Display for StrContextValue {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            StrContextValue::CharLiteral('\n') => "newline".fmt(f),
-            StrContextValue::CharLiteral('`') => "'`'".fmt(f),
-            StrContextValue::CharLiteral(c) if c.is_ascii_control() => {
-                write!(f, "`{}`", c.escape_debug())
-            }
-            StrContextValue::CharLiteral(c) => write!(f, "`{}`", c),
-            StrContextValue::StringLiteral(c) => write!(f, "`{}`", c),
-            StrContextValue::Description(c) => write!(f, "{}", c),
-        }
-    }
-}
-
 fn translate_position(input: &[u8], index: usize) -> (usize, usize) {
     if input.is_empty() {
         return (0, index);
diff --git a/crates/toml_edit/src/parser/inline_table.rs b/crates/toml_edit/src/parser/inline_table.rs
index edda0d60..994e0033 100644
--- a/crates/toml_edit/src/parser/inline_table.rs
+++ b/crates/toml_edit/src/parser/inline_table.rs
@@ -20,8 +20,8 @@ use indexmap::map::Entry;
 // inline-table = inline-table-open inline-table-keyvals inline-table-close
 pub(crate) fn inline_table<'i>(
     check: RecursionCheck,
-) -> impl Parser<Input<'i>, InlineTable, ContextError<'i>> {
-    trace("inline-table", move |input| {
+) -> impl Parser<Input<'i>, InlineTable, ContextError> {
+    trace("inline-table", move |input: &mut Input<'i>| {
         delimited(
             INLINE_TABLE_OPEN,
             cut_err(inline_table_keyvals(check).try_map(|(kv, p)| table_from_pairs(kv, p))),
@@ -99,8 +99,8 @@ pub(crate) const KEYVAL_SEP: u8 = b'=';
 
 fn inline_table_keyvals<'i>(
     check: RecursionCheck,
-) -> impl Parser<Input<'i>, (Vec<(Vec<Key>, TableKeyValue)>, RawString), ContextError<'i>> {
-    move |input| {
+) -> impl Parser<Input<'i>, (Vec<(Vec<Key>, TableKeyValue)>, RawString), ContextError> {
+    move |input: &mut Input<'i>| {
         let check = check.recursing(input)?;
         (
             separated0(keyval(check), INLINE_TABLE_SEP),
@@ -112,8 +112,8 @@ fn inline_table_keyvals<'i>(
 
 fn keyval<'i>(
     check: RecursionCheck,
-) -> impl Parser<Input<'i>, (Vec<Key>, TableKeyValue), ContextError<'i>> {
-    move |input| {
+) -> impl Parser<Input<'i>, (Vec<Key>, TableKeyValue), ContextError> {
+    move |input: &mut Input<'i>| {
         (
             key,
             cut_err((
diff --git a/crates/toml_edit/src/parser/key.rs b/crates/toml_edit/src/parser/key.rs
index 4d731d38..12715da1 100644
--- a/crates/toml_edit/src/parser/key.rs
+++ b/crates/toml_edit/src/parser/key.rs
@@ -17,7 +17,7 @@ use crate::RawString;
 
 // key = simple-key / dotted-key
 // dotted-key = simple-key 1*( dot-sep simple-key )
-pub(crate) fn key(input: Input<'_>) -> IResult<Input<'_>, Vec<Key>, ContextError<'_>> {
+pub(crate) fn key(input: &mut Input<'_>) -> PResult<Vec<Key>> {
     trace(
         "dotted-key",
         separated1(
@@ -43,9 +43,7 @@ pub(crate) fn key(input: Input<'_>) -> IResult<Input<'_>, Vec<Key>, ContextError
 
 // simple-key = quoted-key / unquoted-key
 // quoted-key = basic-string / literal-string
-pub(crate) fn simple_key(
-    input: Input<'_>,
-) -> IResult<Input<'_>, (RawString, InternalString), ContextError<'_>> {
+pub(crate) fn simple_key(input: &mut Input<'_>) -> PResult<(RawString, InternalString)> {
     trace(
         "simple-key",
         dispatch! {peek(any);
@@ -64,7 +62,7 @@ pub(crate) fn simple_key(
 }
 
 // unquoted-key = 1*( ALPHA / DIGIT / %x2D / %x5F ) ; A-Z / a-z / 0-9 / - / _
-fn unquoted_key(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+fn unquoted_key<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "unquoted-key",
         take_while(1.., UNQUOTED_CHAR)
diff --git a/crates/toml_edit/src/parser/mod.rs b/crates/toml_edit/src/parser/mod.rs
index 37a86d9a..1434af3a 100644
--- a/crates/toml_edit/src/parser/mod.rs
+++ b/crates/toml_edit/src/parser/mod.rs
@@ -73,12 +73,12 @@ pub(crate) fn parse_value(raw: &str) -> Result<crate::Value, TomlError> {
 }
 
 pub(crate) mod prelude {
-    pub(crate) use super::errors::ContextError;
-    pub(crate) use super::errors::StrContext;
-    pub(crate) use super::errors::StrContextValue;
     pub(crate) use winnow::combinator::dispatch;
+    pub(crate) use winnow::error::ContextError;
     pub(crate) use winnow::error::FromExternalError;
-    pub(crate) use winnow::IResult;
+    pub(crate) use winnow::error::StrContext;
+    pub(crate) use winnow::error::StrContextValue;
+    pub(crate) use winnow::PResult;
     pub(crate) use winnow::Parser;
 
     pub(crate) type Input<'b> = winnow::Located<&'b winnow::BStr>;
@@ -87,16 +87,6 @@ pub(crate) mod prelude {
         winnow::Located::new(winnow::BStr::new(s))
     }
 
-    pub(crate) fn ok_error<I, O, E>(
-        res: IResult<I, O, E>,
-    ) -> Result<Option<(I, O)>, winnow::error::ErrMode<E>> {
-        match res {
-            Ok(ok) => Ok(Some(ok)),
-            Err(winnow::error::ErrMode::Backtrack(_)) => Ok(None),
-            Err(err) => Err(err),
-        }
-    }
-
     #[cfg(not(feature = "unbounded"))]
     #[derive(Copy, Clone, Debug, Default)]
     pub(crate) struct RecursionCheck {
@@ -115,8 +105,8 @@ pub(crate) mod prelude {
 
         pub(crate) fn recursing(
             mut self,
-            input: Input<'_>,
-        ) -> Result<Self, winnow::error::ErrMode<ContextError<'_>>> {
+            input: &mut Input<'_>,
+        ) -> Result<Self, winnow::error::ErrMode<ContextError>> {
             self.current += 1;
             if self.current < 128 {
                 Ok(self)
@@ -142,8 +132,8 @@ pub(crate) mod prelude {
 
         pub(crate) fn recursing(
             self,
-            _input: Input<'_>,
-        ) -> Result<Self, winnow::error::ErrMode<ContextError<'_>>> {
+            _input: &mut Input<'_>,
+        ) -> Result<Self, winnow::error::ErrMode<ParserError<'_>>> {
             Ok(self)
         }
     }
diff --git a/crates/toml_edit/src/parser/numbers.rs b/crates/toml_edit/src/parser/numbers.rs
index 38790dc6..3e6eb5dd 100644
--- a/crates/toml_edit/src/parser/numbers.rs
+++ b/crates/toml_edit/src/parser/numbers.rs
@@ -19,16 +19,16 @@ use crate::parser::trivia::from_utf8_unchecked;
 
 // boolean = true / false
 #[allow(dead_code)] // directly define in `fn value`
-pub(crate) fn boolean(input: Input<'_>) -> IResult<Input<'_>, bool, ContextError<'_>> {
+pub(crate) fn boolean(input: &mut Input<'_>) -> PResult<bool> {
     trace("boolean", alt((true_, false_))).parse_next(input)
 }
 
-pub(crate) fn true_(input: Input<'_>) -> IResult<Input<'_>, bool, ContextError<'_>> {
+pub(crate) fn true_(input: &mut Input<'_>) -> PResult<bool> {
     (peek(TRUE[0]), cut_err(TRUE)).value(true).parse_next(input)
 }
 const TRUE: &[u8] = b"true";
 
-pub(crate) fn false_(input: Input<'_>) -> IResult<Input<'_>, bool, ContextError<'_>> {
+pub(crate) fn false_(input: &mut Input<'_>) -> PResult<bool> {
     (peek(FALSE[0]), cut_err(FALSE))
         .value(false)
         .parse_next(input)
@@ -38,7 +38,7 @@ const FALSE: &[u8] = b"false";
 // ;; Integer
 
 // integer = dec-int / hex-int / oct-int / bin-int
-pub(crate) fn integer(input: Input<'_>) -> IResult<Input<'_>, i64, ContextError<'_>> {
+pub(crate) fn integer(input: &mut Input<'_>) -> PResult<i64> {
     trace("integer",
     dispatch! {peek(opt::<_, &[u8], _, _>(take(2usize)));
         Some(b"0x") => cut_err(hex_int.try_map(|s| i64::from_str_radix(&s.replace('_', ""), 16))),
@@ -52,7 +52,7 @@ pub(crate) fn integer(input: Input<'_>) -> IResult<Input<'_>, i64, ContextError<
 
 // dec-int = [ minus / plus ] unsigned-dec-int
 // unsigned-dec-int = DIGIT / digit1-9 1*( DIGIT / underscore DIGIT )
-pub(crate) fn dec_int(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn dec_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "dec-int",
         (
@@ -91,7 +91,7 @@ const DIGIT1_9: RangeInclusive<u8> = b'1'..=b'9';
 
 // hex-prefix = %x30.78               ; 0x
 // hex-int = hex-prefix HEXDIG *( HEXDIG / underscore HEXDIG )
-pub(crate) fn hex_int(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn hex_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "hex-int",
         preceded(
@@ -124,7 +124,7 @@ const HEX_PREFIX: &[u8] = b"0x";
 
 // oct-prefix = %x30.6F               ; 0o
 // oct-int = oct-prefix digit0-7 *( digit0-7 / underscore digit0-7 )
-pub(crate) fn oct_int(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn oct_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "oct-int",
         preceded(
@@ -158,7 +158,7 @@ const DIGIT0_7: RangeInclusive<u8> = b'0'..=b'7';
 
 // bin-prefix = %x30.62               ; 0b
 // bin-int = bin-prefix digit0-1 *( digit0-1 / underscore digit0-1 )
-pub(crate) fn bin_int(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn bin_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "bin-int",
         preceded(
@@ -195,7 +195,7 @@ const DIGIT0_1: RangeInclusive<u8> = b'0'..=b'1';
 // float = float-int-part ( exp / frac [ exp ] )
 // float =/ special-float
 // float-int-part = dec-int
-pub(crate) fn float(input: Input<'_>) -> IResult<Input<'_>, f64, ContextError<'_>> {
+pub(crate) fn float(input: &mut Input<'_>) -> PResult<f64> {
     trace(
         "float",
         alt((
@@ -210,7 +210,7 @@ pub(crate) fn float(input: Input<'_>) -> IResult<Input<'_>, f64, ContextError<'_
     .parse_next(input)
 }
 
-pub(crate) fn float_(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn float_<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (dec_int, alt((exp, (frac, opt(exp)).map(|_| ""))))
         .recognize()
         .map(|b: &[u8]| unsafe {
@@ -224,7 +224,7 @@ pub(crate) fn float_(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<
 
 // frac = decimal-point zero-prefixable-int
 // decimal-point = %x2E               ; .
-pub(crate) fn frac(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn frac<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (
         b'.',
         cut_err(zero_prefixable_int)
@@ -241,7 +241,7 @@ pub(crate) fn frac(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_
 }
 
 // zero-prefixable-int = DIGIT *( DIGIT / underscore DIGIT )
-pub(crate) fn zero_prefixable_int(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn zero_prefixable_int<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (
         digit,
         repeat(
@@ -265,7 +265,7 @@ pub(crate) fn zero_prefixable_int(input: Input<'_>) -> IResult<Input<'_>, &str,
 
 // exp = "e" float-exp-part
 // float-exp-part = [ minus / plus ] zero-prefixable-int
-pub(crate) fn exp(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn exp<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (
         one_of((b'e', b'E')),
         opt(one_of([b'+', b'-'])),
@@ -282,7 +282,7 @@ pub(crate) fn exp(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>
 }
 
 // special-float = [ minus / plus ] ( inf / nan )
-pub(crate) fn special_float(input: Input<'_>) -> IResult<Input<'_>, f64, ContextError<'_>> {
+pub(crate) fn special_float(input: &mut Input<'_>) -> PResult<f64> {
     (opt(one_of((b'+', b'-'))), alt((inf, nan)))
         .map(|(s, f)| match s {
             Some(b'+') | None => f,
@@ -292,24 +292,24 @@ pub(crate) fn special_float(input: Input<'_>) -> IResult<Input<'_>, f64, Context
         .parse_next(input)
 }
 // inf = %x69.6e.66  ; inf
-pub(crate) fn inf(input: Input<'_>) -> IResult<Input<'_>, f64, ContextError<'_>> {
+pub(crate) fn inf(input: &mut Input<'_>) -> PResult<f64> {
     tag(INF).value(f64::INFINITY).parse_next(input)
 }
 const INF: &[u8] = b"inf";
 // nan = %x6e.61.6e  ; nan
-pub(crate) fn nan(input: Input<'_>) -> IResult<Input<'_>, f64, ContextError<'_>> {
+pub(crate) fn nan(input: &mut Input<'_>) -> PResult<f64> {
     tag(NAN).value(f64::NAN).parse_next(input)
 }
 const NAN: &[u8] = b"nan";
 
 // DIGIT = %x30-39 ; 0-9
-pub(crate) fn digit(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn digit(input: &mut Input<'_>) -> PResult<u8> {
     one_of(DIGIT).parse_next(input)
 }
 const DIGIT: RangeInclusive<u8> = b'0'..=b'9';
 
 // HEXDIG = DIGIT / "A" / "B" / "C" / "D" / "E" / "F"
-pub(crate) fn hexdig(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn hexdig(input: &mut Input<'_>) -> PResult<u8> {
     one_of(HEXDIG).parse_next(input)
 }
 pub(crate) const HEXDIG: (RangeInclusive<u8>, RangeInclusive<u8>, RangeInclusive<u8>) =
diff --git a/crates/toml_edit/src/parser/strings.rs b/crates/toml_edit/src/parser/strings.rs
index bb256863..26f9cc24 100644
--- a/crates/toml_edit/src/parser/strings.rs
+++ b/crates/toml_edit/src/parser/strings.rs
@@ -13,6 +13,7 @@ use winnow::combinator::repeat;
 use winnow::combinator::success;
 use winnow::combinator::terminated;
 use winnow::prelude::*;
+use winnow::stream::Stream;
 use winnow::token::any;
 use winnow::token::none_of;
 use winnow::token::one_of;
@@ -28,7 +29,7 @@ use crate::parser::trivia::{from_utf8_unchecked, newline, ws, ws_newlines, NON_A
 // ;; String
 
 // string = ml-basic-string / basic-string / ml-literal-string / literal-string
-pub(crate) fn string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+pub(crate) fn string<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     trace(
         "string",
         alt((
@@ -44,25 +45,23 @@ pub(crate) fn string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, Conte
 // ;; Basic String
 
 // basic-string = quotation-mark *basic-char quotation-mark
-pub(crate) fn basic_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
-    trace("basic-string", |input| {
-        let (mut input, _) = one_of(QUOTATION_MARK).parse_next(input)?;
+pub(crate) fn basic_string<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
+    trace("basic-string", |input: &mut Input<'i>| {
+        let _ = one_of(QUOTATION_MARK).parse_next(input)?;
 
         let mut c = Cow::Borrowed("");
-        if let Some((i, ci)) = ok_error(basic_chars.parse_next(input))? {
-            input = i;
+        if let Some(ci) = opt(basic_chars).parse_next(input)? {
             c = ci;
         }
-        while let Some((i, ci)) = ok_error(basic_chars.parse_next(input))? {
-            input = i;
+        while let Some(ci) = opt(basic_chars).parse_next(input)? {
             c.to_mut().push_str(&ci);
         }
 
-        let (input, _) = cut_err(one_of(QUOTATION_MARK))
+        let _ = cut_err(one_of(QUOTATION_MARK))
             .context(StrContext::Label("basic string"))
             .parse_next(input)?;
 
-        Ok((input, c))
+        Ok(c)
     })
     .parse_next(input)
 }
@@ -71,7 +70,7 @@ pub(crate) fn basic_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>,
 pub(crate) const QUOTATION_MARK: u8 = b'"';
 
 // basic-char = basic-unescaped / escaped
-fn basic_chars(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+fn basic_chars<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     alt((
         // Deviate from the official grammar by batching the unescaped chars so we build a string a
         // chunk at a time, rather than a `char` at a time.
@@ -93,7 +92,7 @@ pub(crate) const BASIC_UNESCAPED: (
 ) = (WSCHAR, 0x21, 0x23..=0x5B, 0x5D..=0x7E, NON_ASCII);
 
 // escaped = escape escape-seq-char
-fn escaped(input: Input<'_>) -> IResult<Input<'_>, char, ContextError<'_>> {
+fn escaped(input: &mut Input<'_>) -> PResult<char> {
     preceded(ESCAPE, escape_seq_char).parse_next(input)
 }
 
@@ -109,7 +108,7 @@ pub(crate) const ESCAPE: u8 = b'\\';
 // escape-seq-char =/ %x74         ; t    tab             U+0009
 // escape-seq-char =/ %x75 4HEXDIG ; uXXXX                U+XXXX
 // escape-seq-char =/ %x55 8HEXDIG ; UXXXXXXXX            U+XXXXXXXX
-fn escape_seq_char(input: Input<'_>) -> IResult<Input<'_>, char, ContextError<'_>> {
+fn escape_seq_char(input: &mut Input<'_>) -> PResult<char> {
     dispatch! {any;
         b'b' => success('\u{8}'),
         b'f' => success('\u{c}'),
@@ -137,9 +136,7 @@ fn escape_seq_char(input: Input<'_>) -> IResult<Input<'_>, char, ContextError<'_
     .parse_next(input)
 }
 
-pub(crate) fn hexescape<const N: usize>(
-    input: Input<'_>,
-) -> IResult<Input<'_>, char, ContextError<'_>> {
+pub(crate) fn hexescape<const N: usize>(input: &mut Input<'_>) -> PResult<char> {
     take_while(0..=N, HEXDIG)
         .verify(|b: &[u8]| b.len() == N)
         .map(|b: &[u8]| unsafe { from_utf8_unchecked(b, "`is_ascii_digit` filters out on-ASCII") })
@@ -152,7 +149,7 @@ pub(crate) fn hexescape<const N: usize>(
 
 // ml-basic-string = ml-basic-string-delim [ newline ] ml-basic-body
 //                   ml-basic-string-delim
-fn ml_basic_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+fn ml_basic_string<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     trace(
         "ml-basic-string",
         delimited(
@@ -169,24 +166,20 @@ fn ml_basic_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, Context
 pub(crate) const ML_BASIC_STRING_DELIM: &[u8] = b"\"\"\"";
 
 // ml-basic-body = *mlb-content *( mlb-quotes 1*mlb-content ) [ mlb-quotes ]
-fn ml_basic_body(mut input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+fn ml_basic_body<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     let mut c = Cow::Borrowed("");
-    if let Some((i, ci)) = ok_error(mlb_content.parse_next(input))? {
-        input = i;
+    if let Some(ci) = opt(mlb_content).parse_next(input)? {
         c = ci;
     }
-    while let Some((i, ci)) = ok_error(mlb_content.parse_next(input))? {
-        input = i;
+    while let Some(ci) = opt(mlb_content).parse_next(input)? {
         c.to_mut().push_str(&ci);
     }
 
-    while let Some((i, qi)) = ok_error(mlb_quotes(none_of(b'\"').value(())).parse_next(input))? {
-        if let Some((i, ci)) = ok_error(mlb_content.parse_next(i))? {
-            input = i;
+    while let Some(qi) = opt(mlb_quotes(none_of(b'\"').value(()))).parse_next(input)? {
+        if let Some(ci) = opt(mlb_content).parse_next(input)? {
             c.to_mut().push_str(qi);
             c.to_mut().push_str(&ci);
-            while let Some((i, ci)) = ok_error(mlb_content.parse_next(input))? {
-                input = i;
+            while let Some(ci) = opt(mlb_content).parse_next(input)? {
                 c.to_mut().push_str(&ci);
             }
         } else {
@@ -194,19 +187,16 @@ fn ml_basic_body(mut input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, Conte
         }
     }
 
-    if let Some((i, qi)) =
-        ok_error(mlb_quotes(tag(ML_BASIC_STRING_DELIM).value(())).parse_next(input))?
-    {
-        input = i;
+    if let Some(qi) = opt(mlb_quotes(tag(ML_BASIC_STRING_DELIM).value(()))).parse_next(input)? {
         c.to_mut().push_str(qi);
     }
 
-    Ok((input, c))
+    Ok(c)
 }
 
 // mlb-content = mlb-char / newline / mlb-escaped-nl
 // mlb-char = mlb-unescaped / escaped
-fn mlb_content(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+fn mlb_content<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     alt((
         // Deviate from the official grammar by batching the unescaped chars so we build a string a
         // chunk at a time, rather than a `char` at a time.
@@ -223,17 +213,21 @@ fn mlb_content(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextErro
 
 // mlb-quotes = 1*2quotation-mark
 fn mlb_quotes<'i>(
-    mut term: impl winnow::Parser<Input<'i>, (), ContextError<'i>>,
-) -> impl Parser<Input<'i>, &'i str, ContextError<'i>> {
-    move |input| {
+    mut term: impl winnow::Parser<Input<'i>, (), ContextError>,
+) -> impl Parser<Input<'i>, &'i str, ContextError> {
+    move |input: &mut Input<'i>| {
+        let start = input.checkpoint();
         let res = terminated(b"\"\"", peek(term.by_ref()))
             .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
             .parse_next(input);
 
         match res {
-            Err(winnow::error::ErrMode::Backtrack(_)) => terminated(b"\"", peek(term.by_ref()))
-                .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
-                .parse_next(input),
+            Err(winnow::error::ErrMode::Backtrack(_)) => {
+                input.reset(start);
+                terminated(b"\"", peek(term.by_ref()))
+                    .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
+                    .parse_next(input)
+            }
             res => res,
         }
     }
@@ -253,7 +247,7 @@ pub(crate) const MLB_UNESCAPED: (
 // it will be trimmed along with all whitespace
 // (including newlines) up to the next non-whitespace
 // character or closing delimiter.
-fn mlb_escaped_nl(input: Input<'_>) -> IResult<Input<'_>, (), ContextError<'_>> {
+fn mlb_escaped_nl(input: &mut Input<'_>) -> PResult<()> {
     repeat(1.., (ESCAPE, ws, ws_newlines))
         .map(|()| ())
         .value(())
@@ -263,7 +257,7 @@ fn mlb_escaped_nl(input: Input<'_>) -> IResult<Input<'_>, (), ContextError<'_>>
 // ;; Literal String
 
 // literal-string = apostrophe *literal-char apostrophe
-pub(crate) fn literal_string(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn literal_string<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     trace(
         "literal-string",
         delimited(
@@ -292,7 +286,7 @@ pub(crate) const LITERAL_CHAR: (
 
 // ml-literal-string = ml-literal-string-delim [ newline ] ml-literal-body
 //                     ml-literal-string-delim
-fn ml_literal_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, ContextError<'_>> {
+fn ml_literal_string<'i>(input: &mut Input<'i>) -> PResult<Cow<'i, str>> {
     trace(
         "ml-literal-string",
         delimited(
@@ -315,7 +309,7 @@ fn ml_literal_string(input: Input<'_>) -> IResult<Input<'_>, Cow<'_, str>, Conte
 pub(crate) const ML_LITERAL_STRING_DELIM: &[u8] = b"'''";
 
 // ml-literal-body = *mll-content *( mll-quotes 1*mll-content ) [ mll-quotes ]
-fn ml_literal_body(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+fn ml_literal_body<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (
         repeat(0.., mll_content).map(|()| ()),
         repeat(
@@ -334,7 +328,7 @@ fn ml_literal_body(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_
 }
 
 // mll-content = mll-char / newline
-fn mll_content(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+fn mll_content(input: &mut Input<'_>) -> PResult<u8> {
     alt((one_of(MLL_CHAR), newline)).parse_next(input)
 }
 
@@ -348,17 +342,21 @@ const MLL_CHAR: (
 
 // mll-quotes = 1*2apostrophe
 fn mll_quotes<'i>(
-    mut term: impl winnow::Parser<Input<'i>, (), ContextError<'i>>,
-) -> impl Parser<Input<'i>, &'i str, ContextError<'i>> {
-    move |input| {
+    mut term: impl winnow::Parser<Input<'i>, (), ContextError>,
+) -> impl Parser<Input<'i>, &'i str, ContextError> {
+    move |input: &mut Input<'i>| {
+        let start = input.checkpoint();
         let res = terminated(b"''", peek(term.by_ref()))
             .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
             .parse_next(input);
 
         match res {
-            Err(winnow::error::ErrMode::Backtrack(_)) => terminated(b"'", peek(term.by_ref()))
-                .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
-                .parse_next(input),
+            Err(winnow::error::ErrMode::Backtrack(_)) => {
+                input.reset(start);
+                terminated(b"'", peek(term.by_ref()))
+                    .map(|b| unsafe { from_utf8_unchecked(b, "`bytes` out non-ASCII") })
+                    .parse_next(input)
+            }
             res => res,
         }
     }
diff --git a/crates/toml_edit/src/parser/table.rs b/crates/toml_edit/src/parser/table.rs
index 14366ccb..0ace0c7d 100644
--- a/crates/toml_edit/src/parser/table.rs
+++ b/crates/toml_edit/src/parser/table.rs
@@ -27,8 +27,8 @@ const ARRAY_TABLE_CLOSE: &[u8] = b"]]";
 // std-table = std-table-open key *( table-key-sep key) std-table-close
 pub(crate) fn std_table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         (
             delimited(
                 STD_TABLE_OPEN,
@@ -52,8 +52,8 @@ pub(crate) fn std_table<'s, 'i>(
 // array-table = array-table-open key *( table-key-sep key) array-table-close
 pub(crate) fn array_table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         (
             delimited(
                 ARRAY_TABLE_OPEN,
@@ -77,8 +77,8 @@ pub(crate) fn array_table<'s, 'i>(
 // table = std-table / array-table
 pub(crate) fn table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError<'i>> + 's {
-    move |i| {
+) -> impl Parser<Input<'i>, (), ContextError> + 's {
+    move |i: &mut Input<'i>| {
         dispatch!(peek::<_, &[u8],_,_>(take(2usize));
             b"[[" => array_table(state),
             _ => std_table(state),
diff --git a/crates/toml_edit/src/parser/trivia.rs b/crates/toml_edit/src/parser/trivia.rs
index 653bac0b..a359805b 100644
--- a/crates/toml_edit/src/parser/trivia.rs
+++ b/crates/toml_edit/src/parser/trivia.rs
@@ -28,7 +28,7 @@ pub(crate) unsafe fn from_utf8_unchecked<'b>(
 pub(crate) const WSCHAR: (u8, u8) = (b' ', b'\t');
 
 // ws = *wschar
-pub(crate) fn ws(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn ws<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     take_while(0.., WSCHAR)
         .map(|b| unsafe { from_utf8_unchecked(b, "`is_wschar` filters out on-ASCII") })
         .parse_next(input)
@@ -48,7 +48,7 @@ pub(crate) const NON_EOL: (u8, RangeInclusive<u8>, RangeInclusive<u8>) =
 pub(crate) const COMMENT_START_SYMBOL: u8 = b'#';
 
 // comment = comment-start-symbol *non-eol
-pub(crate) fn comment(input: Input<'_>) -> IResult<Input<'_>, &[u8], ContextError<'_>> {
+pub(crate) fn comment<'i>(input: &mut Input<'i>) -> PResult<&'i [u8]> {
     (COMMENT_START_SYMBOL, take_while(0.., NON_EOL))
         .recognize()
         .parse_next(input)
@@ -56,7 +56,7 @@ pub(crate) fn comment(input: Input<'_>) -> IResult<Input<'_>, &[u8], ContextErro
 
 // newline = ( %x0A /              ; LF
 //             %x0D.0A )           ; CRLF
-pub(crate) fn newline(input: Input<'_>) -> IResult<Input<'_>, u8, ContextError<'_>> {
+pub(crate) fn newline(input: &mut Input<'_>) -> PResult<u8> {
     alt((
         one_of(LF).value(b'\n'),
         (one_of(CR), one_of(LF)).value(b'\n'),
@@ -67,7 +67,7 @@ pub(crate) const LF: u8 = b'\n';
 pub(crate) const CR: u8 = b'\r';
 
 // ws-newline       = *( wschar / newline )
-pub(crate) fn ws_newline(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn ws_newline<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     repeat(
         0..,
         alt((newline.value(&b"\n"[..]), take_while(1.., WSCHAR))),
@@ -79,7 +79,7 @@ pub(crate) fn ws_newline(input: Input<'_>) -> IResult<Input<'_>, &str, ContextEr
 }
 
 // ws-newlines      = newline *( wschar / newline )
-pub(crate) fn ws_newlines(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn ws_newlines<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     (newline, ws_newline)
         .recognize()
         .map(|b| unsafe {
@@ -90,7 +90,7 @@ pub(crate) fn ws_newlines(input: Input<'_>) -> IResult<Input<'_>, &str, ContextE
 
 // note: this rule is not present in the original grammar
 // ws-comment-newline = *( ws-newline-nonempty / comment )
-pub(crate) fn ws_comment_newline(input: Input<'_>) -> IResult<Input<'_>, &[u8], ContextError<'_>> {
+pub(crate) fn ws_comment_newline<'i>(input: &mut Input<'i>) -> PResult<&'i [u8]> {
     repeat(
         0..,
         alt((
@@ -109,15 +109,13 @@ pub(crate) fn ws_comment_newline(input: Input<'_>) -> IResult<Input<'_>, &[u8],
 
 // note: this rule is not present in the original grammar
 // line-ending = newline / eof
-pub(crate) fn line_ending(input: Input<'_>) -> IResult<Input<'_>, &str, ContextError<'_>> {
+pub(crate) fn line_ending<'i>(input: &mut Input<'i>) -> PResult<&'i str> {
     alt((newline.value("\n"), eof.value(""))).parse_next(input)
 }
 
 // note: this rule is not present in the original grammar
 // line-trailing = ws [comment] skip-line-ending
-pub(crate) fn line_trailing(
-    input: Input<'_>,
-) -> IResult<Input<'_>, std::ops::Range<usize>, ContextError<'_>> {
+pub(crate) fn line_trailing(input: &mut Input<'_>) -> PResult<std::ops::Range<usize>> {
     terminated((ws, opt(comment)).span(), line_ending).parse_next(input)
 }
 
diff --git a/crates/toml_edit/src/parser/value.rs b/crates/toml_edit/src/parser/value.rs
index c607aa95..14cd951c 100644
--- a/crates/toml_edit/src/parser/value.rs
+++ b/crates/toml_edit/src/parser/value.rs
@@ -15,10 +15,8 @@ use crate::RawString;
 use crate::Value;
 
 // val = string / boolean / array / inline-table / date-time / float / integer
-pub(crate) fn value<'i>(
-    check: RecursionCheck,
-) -> impl Parser<Input<'i>, v::Value, ContextError<'i>> {
-    move |input| {
+pub(crate) fn value<'i>(check: RecursionCheck) -> impl Parser<Input<'i>, v::Value, ContextError> {
+    move |input: &mut Input<'i>| {
         dispatch!{peek(any);
             crate::parser::strings::QUOTATION_MARK |
             crate::parser::strings::APOSTROPHE => string.map(|s| {