Skip to content

Update syn to v2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelsproul merged 1 commit into from
Dec 15, 2025
Merged

Update syn to v2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion context_deserialize_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ proc-macro = true

[dependencies]
quote = "1.0"
syn = "1.0"
syn = "2"

[dev-dependencies]
context_deserialize = { path = "../context_deserialize" }
Expand Down
18 changes: 11 additions & 7 deletions context_deserialize_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use proc_macro::TokenStream;
use quote::quote;
use syn::{
AttributeArgs, DeriveInput, GenericParam, LifetimeDef, Meta, NestedMeta, WhereClause,
parse_macro_input,
DeriveInput, GenericParam, LifetimeParam, Meta, Token, WhereClause, parse_macro_input,
punctuated::Punctuated,
};

#[proc_macro_attribute]
pub fn context_deserialize(attr: TokenStream, item: TokenStream) -> TokenStream {
let args = parse_macro_input!(attr as AttributeArgs);
let args = parse_macro_input!(attr with Punctuated::<Meta, Token![,]>::parse_terminated);
let input = parse_macro_input!(item as DeriveInput);
let ident = &input.ident;

Expand All @@ -16,11 +16,15 @@ pub fn context_deserialize(attr: TokenStream, item: TokenStream) -> TokenStream

for meta in args {
match meta {
NestedMeta::Meta(Meta::Path(p)) => {
Meta::Path(p) => {
ctx_types.push(p);
}
NestedMeta::Meta(Meta::NameValue(nv)) if nv.path.is_ident("bound") => {
if let syn::Lit::Str(lit_str) = &nv.lit {
Meta::NameValue(nv) if nv.path.is_ident("bound") => {
if let syn::Expr::Lit(syn::ExprLit {
lit: syn::Lit::Str(lit_str),
..
}) = &nv.value
{
let where_string = format!("where {}", lit_str.value());
match syn::parse_str::<WhereClause>(&where_string) {
Ok(where_clause) => {
Expand Down Expand Up @@ -76,7 +80,7 @@ pub fn context_deserialize(attr: TokenStream, item: TokenStream) -> TokenStream
// Ensure 'de lifetime exists in impl generics
let has_de = impl_generics
.lifetimes()
.any(|LifetimeDef { lifetime, .. }| lifetime.ident == "de");
.any(|LifetimeParam { lifetime, .. }| lifetime.ident == "de");

if !has_de {
impl_generics.params.insert(0, syn::parse_quote! { 'de });
Expand Down