Description: Relax dependencies and nest oversized winnow alt tuples
Author: Simon Quigley <tsimonq2@debian.org>
Origin: vendor
Forwarded: not-needed
Last-Update: 2026-11-09
---
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,9 +69,6 @@ version = "7.6.0"
 [dependencies.nextest-metadata]
 version = "0.13.0"
 
-[dependencies.nextest-workspace-hack]
-version = "0.1.0"
-
 [dependencies.proptest]
 version = "1.9.0"
 optional = true
@@ -83,7 +80,7 @@ version = "0.5.4"
 version = "1.12.2"
 
 [dependencies.regex-syntax]
-version = "0.8.8"
+version = "0.8.6"
 
 [dependencies.smol_str]
 version = "0.3.2"
@@ -97,7 +94,7 @@ optional = true
 version = "2.0.17"
 
 [dependencies.winnow]
-version = "0.7.14"
+version = "1.0"
 
 [dependencies.xxhash-rust]
 version = "0.8.15"
--- a/src/parsing.rs
+++ b/src/parsing.rs
@@ -656,19 +656,24 @@ fn platform_def(i: &mut Span<'_>) -> PRe
 fn parse_set_def(input: &mut Span<'_>) -> PResult<Option<ParsedLeaf>> {
     trace(
         "parse_set_def",
+        // winnow 1 implements Alt for at most nine parsers.
         ws(alt((
-            unary_set_def("package", DefaultMatcher::Glob, ParsedLeaf::Package),
-            unary_set_def("deps", DefaultMatcher::Glob, ParsedLeaf::Deps),
-            unary_set_def("rdeps", DefaultMatcher::Glob, ParsedLeaf::Rdeps),
-            unary_set_def("kind", DefaultMatcher::Equal, ParsedLeaf::Kind),
-            // binary_id must go above binary, otherwise we'll parse the opening predicate wrong.
-            unary_set_def("binary_id", DefaultMatcher::Glob, ParsedLeaf::BinaryId),
-            unary_set_def("binary", DefaultMatcher::Glob, ParsedLeaf::Binary),
-            unary_set_def("test", DefaultMatcher::Contains, ParsedLeaf::Test),
-            platform_def,
-            nullary_set_def("default", ParsedLeaf::Default),
-            nullary_set_def("all", |_| ParsedLeaf::All),
-            nullary_set_def("none", |_| ParsedLeaf::None),
+            alt((
+                unary_set_def("package", DefaultMatcher::Glob, ParsedLeaf::Package),
+                unary_set_def("deps", DefaultMatcher::Glob, ParsedLeaf::Deps),
+                unary_set_def("rdeps", DefaultMatcher::Glob, ParsedLeaf::Rdeps),
+                unary_set_def("kind", DefaultMatcher::Equal, ParsedLeaf::Kind),
+                // binary_id must go above binary, otherwise we'll parse the opening predicate wrong.
+                unary_set_def("binary_id", DefaultMatcher::Glob, ParsedLeaf::BinaryId),
+                unary_set_def("binary", DefaultMatcher::Glob, ParsedLeaf::Binary),
+            )),
+            alt((
+                unary_set_def("test", DefaultMatcher::Contains, ParsedLeaf::Test),
+                platform_def,
+                nullary_set_def("default", ParsedLeaf::Default),
+                nullary_set_def("all", |_| ParsedLeaf::All),
+                nullary_set_def("none", |_| ParsedLeaf::None),
+            )),
         ))),
     )
     .parse_next(input)
--- a/src/parsing/unicode_string.rs
+++ b/src/parsing/unicode_string.rs
@@ -24,17 +24,22 @@ fn parse_unicode(input: &mut Span<'_>) -
 
 fn parse_escaped_char(input: &mut Span<'_>) -> PResult<Option<char>> {
     trace("parse_escaped_char", |input: &mut _| {
+        // winnow 1 implements Alt for at most nine parsers.
         let valid = alt((
-            parse_unicode,
-            'n'.value('\n'),
-            'r'.value('\r'),
-            't'.value('\t'),
-            'b'.value('\u{08}'),
-            'f'.value('\u{0C}'),
-            '\\'.value('\\'),
-            '/'.value('/'),
-            ')'.value(')'),
-            ','.value(','),
+            alt((
+                parse_unicode,
+                'n'.value('\n'),
+                'r'.value('\r'),
+                't'.value('\t'),
+                'b'.value('\u{08}'),
+            )),
+            alt((
+                'f'.value('\u{0C}'),
+                '\\'.value('\\'),
+                '/'.value('/'),
+                ')'.value(')'),
+                ','.value(','),
+            )),
         ));
         preceded(
             '\\',
