Upgrade to Winnow 0.7

Author: epage

Cargo.lock

@@ -27,7 +27,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",
 ] }
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 itoa = "1.0.1"
 serde = { version = "1.0.114", optional = true, default-features = false, features = [
     "derive",

gix-actor/Cargo.toml

@@ -26,7 +26,7 @@ gix-sec = { version = "^0.10.11", path = "../gix-sec" }
 gix-ref = { version = "^0.50.0", path = "../gix-ref" }
 gix-glob = { version = "^0.18.0", path = "../gix-glob" }
 
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 memchr = "2"
 thiserror = "2.0.0"
 unicode-bom = { version = "2.0.3" }

gix-config/Cargo.toml

@@ -3,9 +3,9 @@ use std::borrow::Cow;
 use bstr::{BStr, ByteSlice};
 use winnow::{
     combinator::{alt, delimited, opt, preceded, repeat},
-    error::{InputError as NomError, ParserError as _},
+    error::{ErrMode, InputError as NomError, ParserError as _},
     prelude::*,
-    stream::{Offset as _, Stream as _},
+    stream::Offset as _,
     token::{one_of, take_till, take_while},
 };
 
@@ -133,7 +133,10 @@ fn section_header<'i>(i: &mut &'i [u8]) -> ModalResult<section::Header<'i>, NomE
     // No spaces must be between section name and section start
     let name = preceded('[', take_while(1.., is_section_char).map(bstr::ByteSlice::as_bstr)).parse_next(i)?;
 
-    if opt(one_of::<_, _, NomError<&[u8]>>(']')).parse_next(i)?.is_some() {
+    if opt(one_of::<_, _, ErrMode<NomError<&[u8]>>>(']'))
+        .parse_next(i)?
+        .is_some()
+    {
         // Either section does not have a subsection or using deprecated
         // subsection syntax at this point.
         let header = match memchr::memrchr(b'.', name.as_bytes()) {

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

@@ -59,7 +59,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",
 ] }
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 smallvec = { version = "1.4.0", features = ["write"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = [
     "derive",

gix-object/Cargo.toml

@@ -5,7 +5,6 @@ use winnow::{
     combinator::{alt, eof, opt, preceded, repeat, terminated},
     error::{AddContext, ParserError, StrContext},
     prelude::*,
-    stream::Stream as _,
     token::{rest, take_till},
 };
 

gix-object/src/commit/decode.rs

@@ -93,7 +93,7 @@ bstr = { version = "1.3.0", default-features = false, features = [
     "std",
     "unicode",
 ] }
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 
 # for async-client
 async-trait = { version = "0.1.51", optional = true }

gix-protocol/Cargo.toml

@@ -33,7 +33,7 @@ gix-lock = { version = "^16.0.0", path = "../gix-lock" }
 gix-tempfile = { version = "^16.0.0", default-features = false, path = "../gix-tempfile" }
 
 thiserror = "2.0.0"
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 
 # packed refs

gix-ref/Cargo.toml

@@ -1,5 +1,5 @@
 use gix_object::bstr::{BString, ByteSlice};
-use winnow::{combinator::preceded, prelude::*, stream::Stream as _, token::rest};
+use winnow::{combinator::preceded, prelude::*, token::rest};
 
 use crate::store_impl::{packed, packed::decode};
 

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

@@ -31,7 +31,7 @@ gix-worktree = "0.34.0"
 gix-fs = "0.11"
 gix-tempfile = { version = "^14.0.0", default-features = false, features = ["signals"] }
 
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.0", features = ["simd"] }
 fastrand = "2.0.0"
 bstr = { version = "1.5.0", default-features = false }
 crc = "3.0.0"