summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-12-13 16:59:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-13 16:59:04 +0000
commitbc892d2a8fa87530bfaccfca927b27a2ab4f522c (patch)
tree94d92f30ba57bf314aba18f32ae377a670fd7d20
parent7ab2c1f427aafc361a2f746e3b23fbf323b6c8c0 (diff)
parent5576c54d7223c62e76572d4e6f303b68e20f9d1b (diff)
downloadasn1-rs-derive-android14-qpr2-s3-release.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/asn1-rs-derive/+/2870435 Change-Id: Ibed11fb97d24a707a4368d653bd525ec29fa2b9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Cargo.toml4
-rw-r--r--src/alias.rs4
-rw-r--r--src/container.rs11
-rw-r--r--src/sequence.rs4
-rw-r--r--src/set.rs4
5 files changed, 15 insertions, 12 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 8dc4bad..8501e41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,8 +29,8 @@ version = "1.0"
version = "1.0"
[dependencies.syn]
-version = "1.0"
+version = "2.0.39"
features = ["full"]
[dependencies.synstructure]
-version = "0.12"
+version = "0.13.0"
diff --git a/src/alias.rs b/src/alias.rs
index 82ca68e..a8026c6 100644
--- a/src/alias.rs
+++ b/src/alias.rs
@@ -12,7 +12,7 @@ pub fn derive_ber_alias(s: synstructure::Structure) -> proc_macro2::TokenStream
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
@@ -39,7 +39,7 @@ pub fn derive_der_alias(s: synstructure::Structure) -> proc_macro2::TokenStream
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
let impl_tryfrom = container.gen_tryfrom();
diff --git a/src/container.rs b/src/container.rs
index 667992c..88f1152 100644
--- a/src/container.rs
+++ b/src/container.rs
@@ -120,7 +120,10 @@ impl Container {
let error = ast
.attrs
.iter()
- .find(|attr| attr.path.is_ident(&Ident::new("error", Span::call_site())))
+ .find(|attr| {
+ attr.path()
+ .is_ident(&Ident::new("error", Span::call_site()))
+ })
.cloned();
Container {
@@ -326,7 +329,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.path().get_ident() {
Some(ident) => ident.to_string(),
None => continue,
};
@@ -476,8 +479,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/src/sequence.rs b/src/sequence.rs
index 8a0d249..8b1b20a 100644
--- a/src/sequence.rs
+++ b/src/sequence.rs
@@ -12,7 +12,7 @@ pub fn derive_ber_sequence(s: synstructure::Structure) -> proc_macro2::TokenStre
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
@@ -39,7 +39,7 @@ pub fn derive_der_sequence(s: synstructure::Structure) -> proc_macro2::TokenStre
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
let impl_tryfrom = container.gen_tryfrom();
diff --git a/src/set.rs b/src/set.rs
index 90ea04a..5b53e89 100644
--- a/src/set.rs
+++ b/src/set.rs
@@ -12,7 +12,7 @@ pub fn derive_ber_set(s: synstructure::Structure) -> proc_macro2::TokenStream {
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
@@ -39,7 +39,7 @@ pub fn derive_der_set(s: synstructure::Structure) -> proc_macro2::TokenStream {
};
let debug_derive = ast.attrs.iter().any(|attr| {
- attr.path
+ attr.path()
.is_ident(&Ident::new("debug_derive", Span::call_site()))
});
let impl_tryfrom = container.gen_tryfrom();