upgrade to winnow 0.5.24

Byron · Byron · commit abcfb6597864 · 2023-12-05T13:17:48.000+01:00
Fix deprecations while at it - these would show up
during installation as well.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml
@@ -23,7 +23,7 @@ gix-date = { version = "^0.8.0", path = "../gix-date" }
 thiserror = "1.0.38"
 btoi = "0.4.2"
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 itoa = "1.0.1"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml
@@ -24,7 +24,7 @@ gix-sec = { version = "^0.10.0", path = "../gix-sec" }
 gix-ref = { version = "^0.38.0", path = "../gix-ref" }
 gix-glob = { version = "^0.14.0", path = "../gix-glob" }
 
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 memchr = "2"
 thiserror = "1.0.26"
 unicode-bom = "2.0.2"
diff --git a/gix-config/src/parse/nom/mod.rs b/gix-config/src/parse/nom/mod.rs
@@ -6,7 +6,7 @@ use winnow::{
     error::{ErrorKind, InputError as NomError, ParserError as _},
     prelude::*,
     stream::{Offset as _, Stream as _},
-    token::{one_of, take_till0, take_while},
+    token::{one_of, take_till, take_while},
 };
 
 use crate::parse::{error::ParseNode, section, Comment, Error, Event};
@@ -82,7 +82,7 @@ fn newlines_from(input: &[u8], start: winnow::stream::Checkpoint<&[u8]>) -> usiz
 fn comment<'i>(i: &mut &'i [u8]) -> PResult<Comment<'i>, NomError<&'i [u8]>> {
     (
         one_of([';', '#']),
-        take_till0(|c| c == b'\n').map(|text: &[u8]| Cow::Borrowed(text.as_bstr())),
+        take_till(0.., |c| c == b'\n').map(|text: &[u8]| Cow::Borrowed(text.as_bstr())),
     )
         .map(|(tag, text)| Comment { tag, text })
         .parse_next(i)
diff --git a/gix-object/Cargo.toml b/gix-object/Cargo.toml
@@ -38,7 +38,7 @@ btoi = "0.4.2"
 itoa = "1.0.1"
 thiserror = "1.0.34"
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 smallvec = { version = "1.4.0", features = ["write"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
diff --git a/gix-object/src/commit/decode.rs b/gix-object/src/commit/decode.rs
@@ -5,7 +5,7 @@ use winnow::{
     combinator::{alt, eof, opt, preceded, repeat, rest, terminated},
     error::{AddContext, ParserError, StrContext},
     prelude::*,
-    token::take_till1,
+    token::take_till,
 };
 
 use crate::{parse, parse::NL, BStr, ByteSlice, CommitRef};
@@ -42,14 +42,15 @@ pub fn commit<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
             .context(StrContext::Expected("author <signature>".into())),
         (|i: &mut _| parse::header_field(i, b"committer", parse::signature))
             .context(StrContext::Expected("committer <signature>".into())),
-        opt(|i: &mut _| parse::header_field(i, b"encoding", take_till1(NL)))
+        opt(|i: &mut _| parse::header_field(i, b"encoding", take_till(1.., NL)))
             .context(StrContext::Expected("encoding <encoding>".into())),
         repeat(
             0..,
             alt((
                 parse::any_header_field_multi_line.map(|(k, o)| (k.as_bstr(), Cow::Owned(o))),
                 |i: &mut _| {
-                    parse::any_header_field(i, take_till1(NL)).map(|(k, o)| (k.as_bstr(), Cow::Borrowed(o.as_bstr())))
+                    parse::any_header_field(i, take_till(1.., NL))
+                        .map(|(k, o)| (k.as_bstr(), Cow::Borrowed(o.as_bstr())))
                 },
             )),
         )
diff --git a/gix-object/src/commit/message/decode.rs b/gix-object/src/commit/message/decode.rs
@@ -3,7 +3,7 @@ use winnow::{
     error::ParserError,
     prelude::*,
     stream::{Offset, Stream},
-    token::take_till1,
+    token::take_till,
 };
 
 use crate::bstr::{BStr, ByteSlice};
@@ -16,7 +16,7 @@ fn subject_and_body<'a, E: ParserError<&'a [u8]>>(i: &mut &'a [u8]) -> PResult<(
     let start_i = *i;
     let start = i.checkpoint();
     while !i.is_empty() {
-        match take_till1::<_, _, E>(|c| c == b'\n' || c == b'\r').parse_next(i) {
+        match take_till::<_, _, E>(1.., |c| c == b'\n' || c == b'\r').parse_next(i) {
             Ok(_) => {
                 let consumed_bytes = i.offset_from(&start);
                 match preceded((newline::<E>, newline::<E>), rest).parse_next(i) {
diff --git a/gix-object/src/commit/ref_iter.rs b/gix-object/src/commit/ref_iter.rs
@@ -6,7 +6,7 @@ use winnow::{
     combinator::{alt, eof, opt, terminated},
     error::StrContext,
     prelude::*,
-    token::take_till1,
+    token::take_till,
 };
 
 use crate::{
@@ -214,7 +214,7 @@ impl<'a> CommitRefIter<'a> {
                 }
             }
             Encoding => {
-                let encoding = opt(|i: &mut _| parse::header_field(i, b"encoding", take_till1(NL)))
+                let encoding = opt(|i: &mut _| parse::header_field(i, b"encoding", take_till(1.., NL)))
                     .context(StrContext::Expected("encoding <encoding>".into()))
                     .parse_next(input)?;
                 *state = State::ExtraHeaders;
@@ -227,7 +227,7 @@ impl<'a> CommitRefIter<'a> {
                 let extra_header = opt(alt((
                     |i: &mut _| parse::any_header_field_multi_line(i).map(|(k, o)| (k.as_bstr(), Cow::Owned(o))),
                     |i: &mut _| {
-                        parse::any_header_field(i, take_till1(NL))
+                        parse::any_header_field(i, take_till(1.., NL))
                             .map(|(k, o)| (k.as_bstr(), Cow::Borrowed(o.as_bstr())))
                     },
                 )))
diff --git a/gix-object/src/parse.rs b/gix-object/src/parse.rs
@@ -3,7 +3,7 @@ use winnow::{
     combinator::{preceded, repeat, terminated},
     error::{AddContext, ParserError, StrContext},
     prelude::*,
-    token::{take_till1, take_until0, take_while},
+    token::{take_till, take_until0, take_while},
     Parser,
 };
 
@@ -17,9 +17,9 @@ pub(crate) fn any_header_field_multi_line<'a, E: ParserError<&'a [u8]> + AddCont
     i: &mut &'a [u8],
 ) -> PResult<(&'a [u8], BString), E> {
     (
-        terminated(take_till1(SPACE_OR_NL), SPACE),
+        terminated(take_till(1.., SPACE_OR_NL), SPACE),
         (
-            take_till1(NL),
+            take_till(1.., NL),
             NL,
             repeat(1.., terminated((SPACE, take_until0(NL)), NL)).map(|()| ()),
         )
@@ -52,7 +52,7 @@ pub(crate) fn any_header_field<'a, T, E: ParserError<&'a [u8]>>(
     i: &mut &'a [u8],
     parse_value: impl Parser<&'a [u8], T, E>,
 ) -> PResult<(&'a [u8], T), E> {
-    terminated((terminated(take_till1(SPACE_OR_NL), SPACE), parse_value), NL).parse_next(i)
+    terminated((terminated(take_till(1.., SPACE_OR_NL), SPACE), parse_value), NL).parse_next(i)
 }
 
 fn is_hex_digit_lc(b: u8) -> bool {
diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml
@@ -49,7 +49,7 @@ gix-credentials = { version = "^0.21.0", path = "../gix-credentials" }
 thiserror = "1.0.32"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] }
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 btoi = "0.4.2"
 
 # for async-client
diff --git a/gix-protocol/src/remote_progress.rs b/gix-protocol/src/remote_progress.rs
@@ -4,7 +4,7 @@ use bstr::ByteSlice;
 use winnow::{
     combinator::{opt, preceded, terminated},
     prelude::*,
-    token::{tag, take_till0, take_till1},
+    token::{tag, take_till},
 };
 
 /// The information usually found in remote progress messages as sent by a git server during
@@ -74,15 +74,15 @@ impl<'a> RemoteProgress<'a> {
 }
 
 fn parse_number(i: &mut &[u8]) -> PResult<usize, ()> {
-    take_till0(|c: u8| !c.is_ascii_digit())
+    take_till(0.., |c: u8| !c.is_ascii_digit())
         .try_map(btoi::btoi)
         .parse_next(i)
 }
 
 fn next_optional_percentage(i: &mut &[u8]) -> PResult<Option<u32>, ()> {
     opt(terminated(
         preceded(
-            take_till0(|c: u8| c.is_ascii_digit()),
+            take_till(0.., |c: u8| c.is_ascii_digit()),
             parse_number.try_map(u32::try_from),
         ),
         tag(b"%"),
@@ -91,11 +91,11 @@ fn next_optional_percentage(i: &mut &[u8]) -> PResult<Option<u32>, ()> {
 }
 
 fn next_optional_number(i: &mut &[u8]) -> PResult<Option<usize>, ()> {
-    opt(preceded(take_till0(|c: u8| c.is_ascii_digit()), parse_number)).parse_next(i)
+    opt(preceded(take_till(0.., |c: u8| c.is_ascii_digit()), parse_number)).parse_next(i)
 }
 
 fn parse_progress<'i>(line: &mut &'i [u8]) -> PResult<RemoteProgress<'i>, ()> {
-    let action = take_till1(|c| c == b':').parse_next(line)?;
+    let action = take_till(1.., |c| c == b':').parse_next(line)?;
     let percent = next_optional_percentage.parse_next(line)?;
     let step = next_optional_number.parse_next(line)?;
     let max = next_optional_number.parse_next(line)?;
diff --git a/gix-ref/Cargo.toml b/gix-ref/Cargo.toml
@@ -31,7 +31,7 @@ gix-lock = { version = "^11.0.0", path = "../gix-lock" }
 gix-tempfile = { version = "^11.0.0", default-features = false, path = "../gix-tempfile" }
 
 thiserror = "1.0.34"
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
 # packed refs
diff --git a/tests/tools/Cargo.toml b/tests/tools/Cargo.toml
@@ -21,7 +21,7 @@ gix-worktree = "0.17.0"
 gix-fs = { version = "^0.8.0", path = "../../gix-fs" }
 gix-tempfile = { version = "^11.0.0", default-features = false, features = ["signals"], path = "../../gix-tempfile" }
 
-winnow = { version = "0.5.14", features = ["simd"] }
+winnow = { version = "0.5.24", features = ["simd"] }
 fastrand = "2.0.0"
 bstr = { version = "1.5.0", default-features = false }
 crc = "3.0.0"
