feat: Upgrade to winnow 0.5.19 and switch from newly deprecated funct…

…ions
VorpalBlade · Nov 4, 2023 · 3a4ad9f · 3a4ad9f
1 parent adb59e7
commit 3a4ad9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,7 @@ rustc_version_runtime = "0.3.0"
 strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.50"
 which = { version = "5.0.0", default-features = false }
-winnow = "0.5.18"
+winnow = "0.5.19"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
diff --git a/src/config/parser.rs b/src/config/parser.rs
@@ -7,7 +7,7 @@ use winnow::combinator::alt;
 use winnow::combinator::delimited;
 use winnow::combinator::opt;
 use winnow::combinator::preceded;
-use winnow::combinator::separated0;
+use winnow::combinator::separated;
 use winnow::error::StrContext;
 use winnow::prelude::*;
 use winnow::token::take_till0;
@@ -69,7 +69,7 @@ pub(super) fn parse_config(i: &mut &str) -> PResult<Vec<Directive>> {
         "".map(|_| Directive::WS)
             .context(StrContext::Label("whitespace")), // Blank lines
     );
-    (separated0(alt(alternatives), newline), opt(newline))
+    (separated(0.., alt(alternatives), newline), opt(newline))
         .map(|(val, _)| val)
         .parse_next(i)
 }
@@ -167,7 +167,7 @@ fn transform(i: &mut &str) -> PResult<Directive> {
         matcher_transform,
         space1,
         take_till1([' ', '\r', '\n']),
-        opt(preceded(space1, separated0(transform_arg, space1))),
+        opt(preceded(space1, separated(0.., transform_arg, space1))),
     )
         .map(|(_, _, pattern, _, transform, args)| {
             Directive::Transform(pattern, transform.to_owned(), args.unwrap_or_default())