Resolve winnow deprecations in gix-protocol

Author: epage

gix-protocol/src/remote_progress.rs

@@ -2,8 +2,9 @@ use std::convert::TryFrom;
 
 use bstr::ByteSlice;
 use winnow::{
-    bytes::complete::{tag, take_till, take_till1},
-    combinator::{map_res, opt},
+    bytes::{tag, take_till0, take_till1},
+    combinator::opt,
+    prelude::*,
     sequence::{preceded, terminated},
 };
 
@@ -74,21 +75,23 @@ impl<'a> RemoteProgress<'a> {
 }
 
 fn parse_number(i: &[u8]) -> winnow::IResult<&[u8], usize> {
-    map_res(take_till(|c: u8| !c.is_ascii_digit()), btoi::btoi)(i)
+    take_till0(|c: u8| !c.is_ascii_digit())
+        .map_res(btoi::btoi)
+        .parse_next(i)
 }
 
 fn next_optional_percentage(i: &[u8]) -> winnow::IResult<&[u8], Option<u32>> {
     opt(terminated(
         preceded(
-            take_till(|c: u8| c.is_ascii_digit()),
-            map_res(parse_number, u32::try_from),
+            take_till0(|c: u8| c.is_ascii_digit()),
+            parse_number.map_res(u32::try_from),
         ),
         tag(b"%"),
     ))(i)
 }
 
 fn next_optional_number(i: &[u8]) -> winnow::IResult<&[u8], Option<usize>> {
-    opt(preceded(take_till(|c: u8| c.is_ascii_digit()), parse_number))(i)
+    opt(preceded(take_till0(|c: u8| c.is_ascii_digit()), parse_number))(i)
 }
 
 fn parse_progress(line: &[u8]) -> winnow::IResult<&[u8], RemoteProgress<'_>> {