Update winnow to 0.6

gix-actor/Cargo.toml

@@ -23,7 +23,7 @@ gix-date = { version = "^0.8.3", 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.40", features = ["simd"] }
+winnow = { version = "0.6.0", features = ["simd"] }
 itoa = "1.0.1"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 

gix-config/Cargo.toml

@@ -24,7 +24,7 @@ gix-sec = { version = "^0.10.4", path = "../gix-sec" }
 gix-ref = { version = "^0.42.0", path = "../gix-ref" }
 gix-glob = { version = "^0.16.0", path = "../gix-glob" }
 
-winnow = { version = "0.5.40", features = ["simd"] }
+winnow = { version = "0.6.0", features = ["simd"] }
 memchr = "2"
 thiserror = "1.0.26"
 unicode-bom = "2.0.2"

gix-config/src/parse/nom/mod.rs

@@ -71,10 +71,10 @@ pub fn from_bytes<'i>(mut input: &'i [u8], dispatch: &mut dyn FnMut(Event<'i>))
     Ok(())
 }
 
-fn newlines_from(input: &[u8], start: winnow::stream::Checkpoint<&[u8]>) -> usize {
+fn newlines_from(input: &[u8], start: winnow::stream::Checkpoint<&[u8], &[u8]>) -> usize {
     let offset = input.offset_from(&start);
     let mut start_input = input;
-    start_input.reset(start);
+    start_input.reset(&start);
     start_input.next_slice(offset).iter().filter(|c| **c == b'\n').count()
 }
 
@@ -97,7 +97,7 @@ fn section<'i>(
 ) -> PResult<(), NomError<&'i [u8]>> {
     let start = i.checkpoint();
     let header = section_header(i).map_err(|e| {
-        i.reset(start);
+        i.reset(&start);
         e
     })?;
     dispatch(Event::SectionHeader(header));
@@ -277,17 +277,17 @@ fn value_impl<'i>(i: &mut &'i [u8], dispatch: &mut dyn FnMut(Event<'i>)) -> PRes
                     let escaped_index = i.offset_from(&value_start_checkpoint);
                     let escape_index = escaped_index - 1;
                     let Some(mut c) = i.next_token() else {
-                        i.reset(start_checkpoint);
+                        i.reset(&start_checkpoint);
                         return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Token));
                     };
                     let mut consumed = 1;
                     if c == b'\r' {
                         c = i.next_token().ok_or_else(|| {
-                            i.reset(start_checkpoint);
+                            i.reset(&start_checkpoint);
                             winnow::error::ErrMode::from_error_kind(i, ErrorKind::Token)
                         })?;
                         if c != b'\n' {
-                            i.reset(start_checkpoint);
+                            i.reset(&start_checkpoint);
                             return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Slice));
                         }
                         consumed += 1;
@@ -297,7 +297,7 @@ fn value_impl<'i>(i: &mut &'i [u8], dispatch: &mut dyn FnMut(Event<'i>)) -> PRes
                         b'\n' => {
                             partial_value_found = true;
 
-                            i.reset(value_start_checkpoint);
+                            i.reset(&value_start_checkpoint);
 
                             let value = i.next_slice(escape_index).as_bstr();
                             dispatch(Event::ValueNotDone(Cow::Borrowed(value)));
@@ -312,7 +312,7 @@ fn value_impl<'i>(i: &mut &'i [u8], dispatch: &mut dyn FnMut(Event<'i>)) -> PRes
                         }
                         b'n' | b't' | b'\\' | b'b' | b'"' => {}
                         _ => {
-                            i.reset(start_checkpoint);
+                            i.reset(&start_checkpoint);
                             return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Token));
                         }
                     }
@@ -325,7 +325,7 @@ fn value_impl<'i>(i: &mut &'i [u8], dispatch: &mut dyn FnMut(Event<'i>)) -> PRes
         }
     }
     if is_in_quotes {
-        i.reset(start_checkpoint);
+        i.reset(&start_checkpoint);
         return Err(winnow::error::ErrMode::from_error_kind(i, ErrorKind::Slice));
     }
 
@@ -342,7 +342,7 @@ fn value_impl<'i>(i: &mut &'i [u8], dispatch: &mut dyn FnMut(Event<'i>)) -> PRes
         Some(idx) => idx,
     };
 
-    i.reset(value_start_checkpoint);
+    i.reset(&value_start_checkpoint);
     let value_end_no_trailing_whitespace = i[..value_end]
         .iter()
         .enumerate()

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.40", features = ["simd"] }
+winnow = { version = "0.6.0", features = ["simd"] }
 smallvec = { version = "1.4.0", features = ["write"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 

gix-object/src/commit/decode.rs

@@ -5,6 +5,7 @@ use winnow::{
     combinator::{alt, eof, opt, preceded, repeat, rest, terminated},
     error::{AddContext, ParserError, StrContext},
     prelude::*,
+    stream::Stream as _,
     token::take_till,
 };
 
@@ -15,9 +16,13 @@ pub fn message<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
 ) -> PResult<&'a BStr, E> {
     if i.is_empty() {
         // newline + [message]
+        let start = i.checkpoint();
         return Err(
-            winnow::error::ErrMode::from_error_kind(i, winnow::error::ErrorKind::Eof)
-                .add_context(i, StrContext::Expected("newline + <message>".into())),
+            winnow::error::ErrMode::from_error_kind(i, winnow::error::ErrorKind::Eof).add_context(
+                i,
+                &start,
+                StrContext::Expected("newline + <message>".into()),
+            ),
         );
     }
     preceded(NL, rest.map(ByteSlice::as_bstr))

gix-object/src/commit/message/decode.rs

@@ -37,7 +37,7 @@ fn subject_and_body<'a, E: ParserError<&'a [u8]>>(i: &mut &'a [u8]) -> PResult<(
         }
     }
 
-    i.reset(start);
+    i.reset(&start);
     rest.map(|r: &[u8]| (r.as_bstr(), None)).parse_next(i)
 }
 

gix-protocol/Cargo.toml

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

gix-ref/Cargo.toml

@@ -32,7 +32,7 @@ gix-lock = { version = "^13.0.0", path = "../gix-lock" }
 gix-tempfile = { version = "^13.0.0", default-features = false, path = "../gix-tempfile" }
 
 thiserror = "1.0.34"
-winnow = { version = "0.5.40", features = ["simd"] }
+winnow = { version = "0.6.0", features = ["simd"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
 # packed refs

gix-ref/src/store/packed/iter.rs

@@ -46,7 +46,7 @@ impl<'a> Iterator for packed::Iter<'a> {
                 Some(Ok(reference))
             }
             Err(_) => {
-                self.cursor.reset(start);
+                self.cursor.reset(&start);
                 let (failed_line, next_cursor) = self
                     .cursor
                     .find_byte(b'\n')

tests/tools/Cargo.toml

@@ -21,7 +21,7 @@ gix-worktree = "0.26"
 gix-fs = { version = "^0.10.0", path = "../../gix-fs" }
 gix-tempfile = { version = "^13.0.0", default-features = false, features = ["signals"], path = "../../gix-tempfile" }
 
-winnow = { version = "0.5.40", features = ["simd"] }
+winnow = { version = "0.6.0", features = ["simd"] }
 fastrand = "2.0.0"
 bstr = { version = "1.5.0", default-features = false }
 crc = "3.0.0"