Upgrade to syn 2.0

rusticata · Apr 5, 2023 · df44b67 · df44b67
1 parent ad6c4cf
commit df44b67
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,8 +46,8 @@ serialize = ["cookie-factory"]
 std = []
 
 [dependencies]
-asn1-rs-derive = { version="0.4", path="./derive" }
-asn1-rs-impl = { version="0.1", path="./impl" }
+asn1-rs-derive = { version="0.5", path="./derive" }
+asn1-rs-impl = { version="0.2", path="./impl" }
 bitvec = { version="1.0", optional=true }
 cookie-factory = { version="0.3.0", optional=true }
 displaydoc = "0.2.2"

diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asn1-rs-derive"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Pierre Chifflier <chifflier@wzdftpd.net>"]
 description = "Derive macros for the `asn1-rs` crate"
 license = "MIT/Apache-2.0"
@@ -14,5 +14,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = { version="1.0", features = ["full"] }
-synstructure = "0.12"
+syn = { version = "2.0", features = ["full"] }
+synstructure = "0.13"
diff --git a/derive/src/alias.rs b/derive/src/alias.rs
@@ -12,7 +12,8 @@ pub fn derive_ber_alias(s: synstructure::Structure) -> proc_macro2::TokenStream
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
 
@@ -39,7 +40,8 @@ pub fn derive_der_alias(s: synstructure::Structure) -> proc_macro2::TokenStream
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
     let impl_tryfrom = container.gen_tryfrom();

diff --git a/derive/src/container.rs b/derive/src/container.rs
@@ -120,7 +120,11 @@ impl Container {
         let error = ast
             .attrs
             .iter()
-            .find(|attr| attr.path.is_ident(&Ident::new("error", Span::call_site())))
+            .find(|attr| {
+                attr.meta
+                    .path()
+                    .is_ident(&Ident::new("error", Span::call_site()))
+            })
             .cloned();
 
         Container {
@@ -326,7 +330,7 @@ impl From<&Field> for FieldInfo {
             .as_ref()
             .map_or_else(|| Ident::new("_", Span::call_site()), |s| s.clone());
         for attr in &field.attrs {
-            let ident = match attr.path.get_ident() {
+            let ident = match attr.meta.path().get_ident() {
                 Some(ident) => ident.to_string(),
                 None => continue,
             };
@@ -476,8 +480,8 @@ fn get_field_parser(f: &FieldInfo, asn1_type: Asn1Type, custom_errors: bool) ->
 }
 
 fn get_attribute_meta(attr: &Attribute) -> Result<TokenStream, syn::Error> {
-    if let Ok(Meta::List(meta)) = attr.parse_meta() {
-        let content = &meta.nested;
+    if let Meta::List(meta) = &attr.meta {
+        let content = &meta.tokens;
         Ok(quote! { #content })
     } else {
         Err(syn::Error::new(

diff --git a/derive/src/sequence.rs b/derive/src/sequence.rs
@@ -12,7 +12,8 @@ pub fn derive_ber_sequence(s: synstructure::Structure) -> proc_macro2::TokenStre
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
 
@@ -39,7 +40,8 @@ pub fn derive_der_sequence(s: synstructure::Structure) -> proc_macro2::TokenStre
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
     let impl_tryfrom = container.gen_tryfrom();

diff --git a/derive/src/set.rs b/derive/src/set.rs
@@ -12,7 +12,8 @@ pub fn derive_ber_set(s: synstructure::Structure) -> proc_macro2::TokenStream {
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
 
@@ -39,7 +40,8 @@ pub fn derive_der_set(s: synstructure::Structure) -> proc_macro2::TokenStream {
     };
 
     let debug_derive = ast.attrs.iter().any(|attr| {
-        attr.path
+        attr.meta
+            .path()
             .is_ident(&Ident::new("debug_derive", Span::call_site()))
     });
     let impl_tryfrom = container.gen_tryfrom();

diff --git a/impl/Cargo.toml b/impl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asn1-rs-impl"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Pierre Chifflier <chifflier@wzdftpd.net>"]
 description = "Implementation details for the `asn1-rs` crate"
 license = "MIT/Apache-2.0"
@@ -14,4 +14,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1"
 quote = "1"
-syn = "1"
+syn = "2.0"