From 754769b8f5875e043e37158d7aaa1c12acb847da Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 30 Jan 2025 12:30:35 -0600
Subject: [PATCH] chore: Upgrade to Winnow 0.7

---
 Cargo.lock                              |  4 ++--
 crates/toml_edit/Cargo.toml             |  2 +-
 crates/toml_edit/src/parser/datetime.rs | 10 +++-------
 crates/toml_edit/src/parser/mod.rs      | 13 ++++---------
 crates/toml_edit/src/parser/trivia.rs   |  1 -
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e21cded..52fb7cff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1176,9 +1176,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.26"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28"
+checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419"
 dependencies = [
  "memchr",
 ]
diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml
index a9d73c00..2bc20ced 100644
--- a/crates/toml_edit/Cargo.toml
+++ b/crates/toml_edit/Cargo.toml
@@ -41,7 +41,7 @@ unbounded = []
 
 [dependencies]
 indexmap = { version = "2.3.0", features = ["std"] }
-winnow = { version = "0.6.26", optional = true }
+winnow = { version = "0.7.0", optional = true }
 serde = { version = "1.0.145", optional = true }
 kstring = { version = "2.0.0", features = ["max_inline"], optional = true }
 toml_datetime = { version = "0.6.8", path = "../toml_datetime" }
diff --git a/crates/toml_edit/src/parser/datetime.rs b/crates/toml_edit/src/parser/datetime.rs
index b55bab12..2030b549 100644
--- a/crates/toml_edit/src/parser/datetime.rs
+++ b/crates/toml_edit/src/parser/datetime.rs
@@ -74,13 +74,9 @@ fn full_date_(input: &mut Input<'_>) -> ModalResult<Date> {
     };
     if max_days_in_month < day {
         input.reset(&day_start);
-        #[expect(deprecated)]
-        return Err(winnow::error::ErrMode::from_external_error(
-            input,
-            winnow::error::ErrorKind::Verify,
-            CustomError::OutOfRange,
-        )
-        .cut());
+        return Err(
+            winnow::error::ErrMode::from_external_error(input, CustomError::OutOfRange).cut(),
+        );
     }
 
     Ok(Date { year, month, day })
diff --git a/crates/toml_edit/src/parser/mod.rs b/crates/toml_edit/src/parser/mod.rs
index 92c22e9a..6c71a116 100644
--- a/crates/toml_edit/src/parser/mod.rs
+++ b/crates/toml_edit/src/parser/mod.rs
@@ -139,15 +139,10 @@ pub(crate) mod prelude {
         mut parser: impl ModalParser<Input<'b>, O, ContextError>,
     ) -> impl ModalParser<Input<'b>, O, ContextError> {
         move |input: &mut Input<'b>| {
-            input.state.enter().map_err(|err| {
-                #[allow(deprecated)]
-                winnow::error::ErrMode::from_external_error(
-                    input,
-                    winnow::error::ErrorKind::Eof,
-                    err,
-                )
-                .cut()
-            })?;
+            input
+                .state
+                .enter()
+                .map_err(|err| winnow::error::ErrMode::from_external_error(input, err).cut())?;
             let result = parser.parse_next(input);
             input.state.exit();
             result
diff --git a/crates/toml_edit/src/parser/trivia.rs b/crates/toml_edit/src/parser/trivia.rs
index 7f5768d6..8597e8cd 100644
--- a/crates/toml_edit/src/parser/trivia.rs
+++ b/crates/toml_edit/src/parser/trivia.rs
@@ -9,7 +9,6 @@ use winnow::combinator::peek;
 use winnow::combinator::repeat;
 use winnow::combinator::terminated;
 use winnow::prelude::*;
-use winnow::stream::Stream as _;
 use winnow::token::any;
 use winnow::token::one_of;
 use winnow::token::take_while;