chore(deps): update to winnow v0.6

Also, update all the other dependencies, but the winnow update is the biggest change with several API adjustments.
dnaka91 · Feb 14, 2024 · 83bfd8c · 83bfd8c
1 parent 554b05b
commit 83bfd8c
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ rustc-hash = "1.1.0"
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 syn = "2.0.48"
-thiserror = "1.0.56"
+thiserror = "1.0.57"
 
 [profile.release]
 lto = "thin"

diff --git a/crates/mabo-benches/Cargo.toml b/crates/mabo-benches/Cargo.toml
@@ -28,7 +28,7 @@ mabo-parser = { path = "../mabo-parser" }
 mimalloc.workspace = true
 
 [dev-dependencies]
-divan = "0.1.11"
+divan = "0.1.13"
 indoc.workspace = true
 
 [lints]

diff --git a/crates/mabo-derive/src/cause.rs b/crates/mabo-derive/src/cause.rs
@@ -446,8 +446,8 @@ fn expand_winnow(ident: &Ident, variants: &[VariantInfo<'_>]) -> syn::Result<Tok
                 let ty = &v.fields[0].0.ty;
 
                 Ok(quote! {
-                    impl<I> winnow::error::FromExternalError<I, #ty> for #ident {
-                        fn from_external_error(_: &I, _: winnow::error::ErrorKind, e: #ty) -> Self {
+                    impl<I> ::winnow::error::FromExternalError<I, #ty> for #ident {
+                        fn from_external_error(_: &I, _: ::winnow::error::ErrorKind, e: #ty) -> Self {
                             Self::#variant_ident(e)
                         }
                     }
@@ -457,11 +457,11 @@ fn expand_winnow(ident: &Ident, variants: &[VariantInfo<'_>]) -> syn::Result<Tok
                 let ty = &v.fields[1].0.ty;
 
                 Ok(quote! {
-                    impl<I> winnow::error::FromExternalError<I, #ty> for #ident
+                    impl<I> ::winnow::error::FromExternalError<I, #ty> for #ident
                     where
-                        I: winnow::stream::Location,
+                        I: ::winnow::stream::Location,
                     {
-                        fn from_external_error(input: &I, _: winnow::error::ErrorKind, e: #ty) -> Self {
+                        fn from_external_error(input: &I, _: ::winnow::error::ErrorKind, e: #ty) -> Self {
                             Self::#variant_ident {
                                 at: input.location(),
                                 cause: e,
@@ -475,15 +475,15 @@ fn expand_winnow(ident: &Ident, variants: &[VariantInfo<'_>]) -> syn::Result<Tok
     }).collect::<syn::Result<Vec<_>>>()?;
 
     Ok(quote! {
-        impl<I> winnow::error::ParserError<I> for #ident
+        impl<I> ::winnow::error::ParserError<I> for #ident
         where
-            I: winnow::stream::Location,
+            I: ::winnow::stream::Location + ::winnow::stream::Stream,
         {
-            fn from_error_kind(input: &I, kind: winnow::error::ErrorKind) -> Self {
+            fn from_error_kind(input: &I, kind: ::winnow::error::ErrorKind) -> Self {
                 Self::Parser(kind, input.location())
             }
 
-            fn append(self, _: &I, _: winnow::error::ErrorKind) -> Self {
+            fn append(self, _: &I, _: &I::Checkpoint, _: ::winnow::error::ErrorKind) -> Self {
                 self
             }
         }

diff --git a/crates/mabo-derive/src/error.rs b/crates/mabo-derive/src/error.rs
@@ -48,7 +48,7 @@ pub fn expand(derive: DeriveInput) -> syn::Result<TokenStream> {
 
         impl<I> ::winnow::error::ParserError<I> for #ident
         where
-            I: ::winnow::stream::Location,
+            I: ::winnow::stream::Location + ::winnow::stream::Stream,
         {
             fn from_error_kind(input: &I, kind: ::winnow::error::ErrorKind) -> Self {
                 Self{
@@ -57,7 +57,7 @@ pub fn expand(derive: DeriveInput) -> syn::Result<TokenStream> {
                 }
             }
 
-            fn append(self, _: &I, _: ::winnow::error::ErrorKind) -> Self {
+            fn append(self, _: &I, _: &I::Checkpoint, _: ::winnow::error::ErrorKind) -> Self {
                 self
             }
         }

diff --git a/crates/mabo-parser/Cargo.toml b/crates/mabo-parser/Cargo.toml
@@ -17,7 +17,7 @@ anstream.workspace = true
 anstyle.workspace = true
 mabo-derive = { path = "../mabo-derive" }
 miette = { workspace = true, features = ["derive"] }
-winnow = "0.5.39"
+winnow = "0.6.0"
 
 [dev-dependencies]
 indoc.workspace = true

diff --git a/crates/mabo-parser/src/error.rs b/crates/mabo-parser/src/error.rs
@@ -124,13 +124,13 @@ impl From<ParseDefinitionError> for ParseSchemaCause {
 
 impl<I> winnow::error::ParserError<I> for ParseSchemaCause
 where
-    I: winnow::stream::Location,
+    I: winnow::stream::Location + winnow::stream::Stream,
 {
     fn from_error_kind(input: &I, kind: winnow::error::ErrorKind) -> Self {
         Self::Parser(kind, input.location())
     }
 
-    fn append(self, _: &I, _: winnow::error::ErrorKind) -> Self {
+    fn append(self, _: &I, _: &I::Checkpoint, _: winnow::error::ErrorKind) -> Self {
         self
     }
 }
@@ -248,13 +248,13 @@ impl From<ParseImportError> for ParseDefinitionError {
 
 impl<I> winnow::error::ParserError<I> for ParseDefinitionError
 where
-    I: winnow::stream::Location,
+    I: winnow::stream::Location + winnow::stream::Stream,
 {
     fn from_error_kind(input: &I, kind: winnow::error::ErrorKind) -> Self {
         Self::Parser(kind, input.location())
     }
 
-    fn append(self, _: &I, _: winnow::error::ErrorKind) -> Self {
+    fn append(self, _: &I, _: &I::Checkpoint, _: winnow::error::ErrorKind) -> Self {
         self
     }
 }
diff --git a/crates/mabo-parser/src/location.rs b/crates/mabo-parser/src/location.rs
@@ -7,7 +7,7 @@ use winnow::{
 
 pub fn from_until<const N: usize, I>(
     mut input: Located<I>,
-    start: Checkpoint<<I as Stream>::Checkpoint>,
+    start: &Checkpoint<<I as Stream>::Checkpoint, Located<I>>,
     chars: [char; N],
 ) -> Range<usize>
 where

diff --git a/crates/mabo-parser/src/parser.rs b/crates/mabo-parser/src/parser.rs
@@ -194,7 +194,7 @@ mod comments {
         .map(Comment)
         .map_err(|e| {
             e.map(|cause| ParseError {
-                at: location::from_until(*input, start, ['\n']),
+                at: location::from_until(*input, &start, ['\n']),
                 cause,
             })
         })

diff --git a/crates/mabo-parser/src/parser/consts.rs b/crates/mabo-parser/src/parser/consts.rs
@@ -99,7 +99,7 @@ pub(super) fn parse<'i>(input: &mut Input<'i>) -> Result<Const<'i>, ParseError>
     })
     .map_err(|e| {
         e.map(|cause| ParseError {
-            at: location::from_until(*input, start, [';']),
+            at: location::from_until(*input, &start, [';']),
             cause,
         })
     })

diff --git a/crates/mabo-parser/src/parser/fields.rs b/crates/mabo-parser/src/parser/fields.rs
@@ -80,7 +80,7 @@ pub(super) fn parse<'i>(input: &mut Input<'i>) -> Result<Fields<'i>, ParseError>
     .parse_next(input)
     .map_err(|e| {
         e.map(|cause| ParseError {
-            at: location::from_until(*input, start, [',', '\n']),
+            at: location::from_until(*input, &start, [',', '\n']),
             cause,
         })
     })

diff --git a/crates/mabo-parser/src/parser/imports.rs b/crates/mabo-parser/src/parser/imports.rs
@@ -91,7 +91,7 @@ pub(super) fn parse<'i>(input: &mut Input<'i>) -> Result<Import<'i>, ParseError>
     })
     .map_err(|e| {
         e.map(|cause| ParseError {
-            at: location::from_until(*input, start, [';']),
+            at: location::from_until(*input, &start, [';']),
             cause,
         })
     })

diff --git a/crates/mabo-parser/src/parser/modules.rs b/crates/mabo-parser/src/parser/modules.rs
@@ -83,7 +83,7 @@ pub(super) fn parse<'i>(input: &mut Input<'i>) -> Result<Module<'i>, ParseError>
     })
     .map_err(|e| {
         e.map(|cause| ParseError {
-            at: location::from_until(*input, start, ['}', '\n']),
+            at: location::from_until(*input, &start, ['}', '\n']),
             cause,
         })
     })

diff --git a/crates/mabo-parser/src/parser/structs.rs b/crates/mabo-parser/src/parser/structs.rs
@@ -83,7 +83,7 @@ pub(super) fn parse<'i>(input: &mut Input<'i>) -> Result<Struct<'i>, ParseError>
     })
     .map_err(|e| {
         e.map(|cause| ParseError {
-            at: location::from_until(*input, start, ['}', '\n']),
+            at: location::from_until(*input, &start, ['}', '\n']),
             cause,
         })
     })