Upgrade gix-protocol to winnow 0.5

Author: epage

Cargo.lock

@@ -49,7 +49,7 @@ gix-credentials = { version = "^0.18.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.4.0", features = ["simd"] }
+winnow = { version = "0.5.14", features = ["simd"] }
 btoi = "0.4.2"
 
 # for async-client

gix-protocol/Cargo.toml

@@ -26,8 +26,8 @@ pub struct RemoteProgress<'a> {
 
 impl<'a> RemoteProgress<'a> {
     /// Parse the progress from a typical git progress `line` as sent by the remote.
-    pub fn from_bytes(line: &[u8]) -> Option<RemoteProgress<'_>> {
-        parse_progress(line).ok().and_then(|(_, r)| {
+    pub fn from_bytes(mut line: &[u8]) -> Option<RemoteProgress<'_>> {
+        parse_progress(&mut line).ok().and_then(|r| {
             if r.percent.is_none() && r.step.is_none() && r.max.is_none() {
                 None
             } else {
@@ -74,13 +74,13 @@ impl<'a> RemoteProgress<'a> {
     }
 }
 
-fn parse_number(i: &[u8]) -> winnow::IResult<&[u8], usize> {
+fn parse_number(i: &mut &[u8]) -> PResult<usize> {
     take_till0(|c: u8| !c.is_ascii_digit())
         .try_map(btoi::btoi)
         .parse_next(i)
 }
 
-fn next_optional_percentage(i: &[u8]) -> winnow::IResult<&[u8], Option<u32>> {
+fn next_optional_percentage(i: &mut &[u8]) -> PResult<Option<u32>> {
     opt(terminated(
         preceded(
             take_till0(|c: u8| c.is_ascii_digit()),
@@ -91,22 +91,19 @@ fn next_optional_percentage(i: &[u8]) -> winnow::IResult<&[u8], Option<u32>> {
     .parse_next(i)
 }
 
-fn next_optional_number(i: &[u8]) -> winnow::IResult<&[u8], Option<usize>> {
+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)
 }
 
-fn parse_progress(line: &[u8]) -> winnow::IResult<&[u8], RemoteProgress<'_>> {
-    let (i, action) = take_till1(|c| c == b':').parse_next(line)?;
-    let (i, percent) = next_optional_percentage.parse_next(i)?;
-    let (i, step) = next_optional_number.parse_next(i)?;
-    let (i, max) = next_optional_number.parse_next(i)?;
-    Ok((
-        i,
-        RemoteProgress {
-            action: action.into(),
-            percent,
-            step,
-            max,
-        },
-    ))
+fn parse_progress<'i>(line: &mut &'i [u8]) -> PResult<RemoteProgress<'i>> {
+    let action = take_till1(|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)?;
+    Ok(RemoteProgress {
+        action: action.into(),
+        percent,
+        step,
+        max,
+    })
 }