chore: bump syn -> 2.0

CosmWasm · Jan 18, 2024 · 63c0b9e · 63c0b9e
1 parent 511d88b
commit 63c0b9e
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 124 deletions.
diff --git a/Cargo.lock b/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);

diff --git a/sylvia-derive/src/message.rs b/sylvia-derive/src/message.rs
@@ -175,9 +175,16 @@ impl<'a> EnumMessage<'a> {
             .items
             .iter()
             .filter_map(|item| match item {
-                TraitItem::Method(method) => {
-                    let msg_attr = method.attrs.iter().find(|attr| attr.path.is_ident("msg"))?;
-                    let attr = match MsgAttr::parse.parse2(msg_attr.tokens.clone()) {
+                TraitItem::Fn(method) => {
+                    let msg_attr = method
+                        .attrs
+                        .iter()
+                        .find(|attr: &&Attribute| attr.path().is_ident("msg"))?;
+                    let attr = match msg_attr
+                        .meta
+                        .require_list()
+                        .and_then(|meta| MsgAttr::parse.parse2(meta.tokens.clone()))
+                    {
                         Ok(attr) => attr,
                         Err(err) => {
                             emit_error!(method.span(), err);
@@ -841,7 +848,11 @@ where
         let variants: Vec<_> = source
             .filter_map(|variant_desc| {
                 let msg_attr = variant_desc.attr_msg()?;
-                let attr = match MsgAttr::parse.parse2(msg_attr.tokens.clone()) {
+                let attr = match msg_attr
+                    .meta
+                    .require_list()
+                    .and_then(|meta| MsgAttr::parse.parse2(meta.tokens.clone()))
+                {
                     Ok(attr) => attr,
                     Err(err) => {
                         emit_error!(variant_desc.span(), err);
@@ -1621,16 +1632,20 @@ impl<'a> EntryPoints<'a> {
         let error = source
             .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 generics: Vec<_> = source.generics.params.iter().collect();