chore: bump syn -> 2.0

CosmWasm · Jan 22, 2024 · a373829 · a373829
1 parent 511d88b
commit a373829
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 137 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,7 +105,7 @@ jobs:
     name: Code coverage
     runs-on: ubuntu-latest
     container:
-      image:                    xd009642/tarpaulin:develop
+      image:                    xd009642/tarpaulin:0.27.1
       options:                  --security-opt seccomp=unconfined
     steps:
       - name:                   Checkout sources

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/sylvia-derive/Cargo.toml b/sylvia-derive/Cargo.toml
@@ -18,9 +18,7 @@ cosmwasm_1_2 = []
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.107", features = [
-    "parsing",
-    "derive",
+syn = { version = "2.0.48", features = [
     "fold",
     "visit",
     "full",

diff --git a/sylvia-derive/src/input.rs b/sylvia-derive/src/input.rs
@@ -136,16 +136,20 @@ impl<'a> ImplInput<'a> {
         let error = item
             .attrs
             .iter()
-            .find(|attr| attr.path.is_ident("error"))
-            .and_then(
-                |attr| match ContractErrorAttr::parse.parse2(attr.tokens.clone()) {
+            .find(|attr| attr.path().is_ident("error"))
+            .and_then(|attr| {
+                match attr
+                    .meta
+                    .require_list()
+                    .and_then(|meta| ContractErrorAttr::parse.parse2(meta.tokens.clone()))
+                {
                     Ok(error) => Some(error.error),
                     Err(err) => {
                         emit_error!(attr.span(), err);
                         None
                     }
-                },
-            )
+                }
+            })
             .unwrap_or_else(|| parse_quote! { #sylvia ::cw_std::StdError });
 
         let custom = Custom::new(&item.attrs);

diff --git a/sylvia-derive/src/interfaces.rs b/sylvia-derive/src/interfaces.rs
@@ -19,9 +19,13 @@ impl Interfaces {
         let interfaces: Vec<_> = source
             .attrs
             .iter()
-            .filter(|attr| attr.path.is_ident("messages"))
+            .filter(|attr| attr.path().is_ident("messages"))
             .filter_map(|attr| {
-                let interface = match ContractMessageAttr::parse.parse2(attr.tokens.clone()) {
+                let interface = match attr
+                    .meta
+                    .require_list()
+                    .and_then(|meta| ContractMessageAttr::parse.parse2(meta.tokens.clone()))
+                {
                     Ok(interface) => interface,
                     Err(err) => {
                         emit_error!(attr.span(), err);