Update winnow and fix compile errors

Author: caass

Cargo.lock

@@ -21,7 +21,7 @@ wide = "0.7.32"
 eyre = "0.6.12"
 nohash-hasher = "0.2.0"
 itoa = "1.0"
-winnow = { version = "0.6.26", features = ["simd"] }
+winnow = { version = "0.7.4", features = ["simd"] }
 tinystr = { version = "0.8.1", features = ["std"] }
 fnv = "1.0.7"
 petgraph = { version = "0.7.1", features = ["rayon"] }

Cargo.toml

@@ -5,7 +5,7 @@ use rayon::prelude::*;
 
 use winnow::ascii::{alpha1, digit1};
 use winnow::combinator::seq;
-use winnow::error::{ContextError, ErrMode, ParseError, StrContext};
+use winnow::error::{ContextError, StrContext};
 use winnow::prelude::*;
 
 use crate::common::{TryFromStr, TryParse};
@@ -107,7 +107,7 @@ struct Leg<'s> {
 }
 
 impl<'s> TryFromStr<'s> for Leg<'s> {
-    type Err = ParseError<&'s str, ErrMode<ContextError>>;
+    type Err = ContextError;
 
     fn try_from_str(input: &'s str) -> Result<Self, Self::Err> {
         seq! { Leg {
@@ -117,6 +117,6 @@ impl<'s> TryFromStr<'s> for Leg<'s> {
             _: " = ",
             distance: digit1.context(StrContext::Label("distance")).parse_to()
         }}
-        .parse(input.trim())
+        .parse_next(&mut input.trim())
     }
 }

src/2015/09.rs

@@ -5,7 +5,7 @@ use petgraph::{Directed, Graph};
 use rayon::prelude::*;
 use winnow::ascii::{alpha1, digit1};
 use winnow::combinator::{alt, eof, preceded, separated_pair, seq};
-use winnow::error::{ContextError, ParseError};
+use winnow::error::{ContextError, ErrMode};
 use winnow::prelude::*;
 
 use crate::common::{TryFromStr, TryParse};
@@ -108,7 +108,7 @@ struct Relationship<'s> {
 }
 
 impl<'s> TryFromStr<'s> for Relationship<'s> {
-    type Err = ParseError<&'s str, ContextError>;
+    type Err = ErrMode<ContextError>;
 
     fn try_from_str(value: &'s str) -> Result<Self, Self::Err> {
         fn parse_feeling(input: &mut &str) -> ModalResult<isize> {
@@ -128,7 +128,7 @@ impl<'s> TryFromStr<'s> for Relationship<'s> {
             object: alpha1,
             _: preceded('.', eof)
         }}
-        .parse(value.trim())
+        .parse_next(&mut value.trim())
     }
 }
 

src/2015/13.rs

@@ -9,7 +9,7 @@ use rayon::prelude::*;
 use winnow::{
     ascii::{alpha1, digit1},
     combinator::{eof, preceded, seq},
-    error::{ContextError, ParseError},
+    error::ContextError,
     Parser,
 };
 
@@ -180,7 +180,7 @@ impl<'s> TryFromStr<'s> for Reindeer<'s> {
             rest_duration: digit1.parse_to(),
             _: preceded(" seconds.", eof)
         }}
-        .parse(value.trim())
-        .map_err(|e: ParseError<_, ContextError>| eyre!("{e}"))
+        .parse_next(&mut value.trim())
+        .map_err(|e: ContextError| eyre!("{e}"))
     }
 }

src/2015/14.rs

@@ -221,25 +221,25 @@ impl AddAssign for Qualities {
 impl<'s> TryFromStr<'s> for Ingredient<'s> {
     type Err = Report;
 
-    fn try_from_str(value: &'s str) -> Result<Self> {
+    fn try_from_str(mut value: &'s str) -> Result<Self> {
         seq! {Ingredient {
             name: alpha1::<_, ContextError>,
             qualities: seq!{Qualities {
                 _: ": capacity ",
-                capacity: dec_int,
+                capacity: dec_int::<_, _, ContextError>,
                 _: ", durability ",
-                durability: dec_int,
+                durability: dec_int::<_, _, ContextError>,
                 _: ", flavor ",
-                flavor: dec_int,
+                flavor: dec_int::<_, _, ContextError>,
                 _: ", texture ",
-                texture: dec_int,
+                texture: dec_int::<_, _, ContextError>,
                 _: ", calories ",
-                calories: dec_int,
+                calories: dec_int::<_, _, ContextError>,
             }},
-            _: eof
+            _: eof::<_, ContextError>
         }}
-        .parse(value)
-        .map_err(|e| eyre!("{e}"))
+        .parse_next(&mut value)
+        .map_err(|e: ContextError| eyre!("{e}"))
     }
 }
 

src/2015/15.rs

@@ -200,13 +200,13 @@ impl FromStr for Instruction {
     type Err = Report;
 
     #[inline]
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
+    fn from_str(mut s: &str) -> Result<Self, Self::Err> {
         seq! {Instruction {
             turn: alt::<_, _, ContextError, _>(("R", "L")).parse_to(),
-            steps: dec_uint
+            steps: dec_uint::<_, _, ContextError>
         }}
-        .parse(s)
-        .map_err(|_| eyre!("Invalid instruction: {s}"))
+        .parse_next(&mut s)
+        .map_err(|_: ContextError| eyre!("Invalid instruction: {s}"))
     }
 }