Skip to content

Update syn requirement from 1 to 2 #12

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
merged 1 commit into from
Oct 24, 2024
Merged

Update syn requirement from 1 to 2 #12

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 pyo3-asyncio-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0"
quote = "1"
syn = { version = "1", features = ["full"] }
syn = { version = "2", features = ["full"] }
27 changes: 21 additions & 6 deletions pyo3-asyncio-macros/src/tokio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ fn parse_string(int: syn::Lit, span: Span, field: &str) -> Result<String, syn::E

fn parse_knobs(
input: syn::ItemFn,
args: syn::AttributeArgs,
args: Vec<syn::Meta>,
is_test: bool,
rt_multi_thread: bool,
) -> Result<TokenStream, syn::Error> {
Expand All @@ -156,18 +156,32 @@ fn parse_knobs(

for arg in args {
match arg {
syn::NestedMeta::Meta(syn::Meta::NameValue(namevalue)) => {
syn::Meta::NameValue(namevalue) => {
let ident = namevalue.path.get_ident();
if ident.is_none() {
let msg = "Must have specified ident";
return Err(syn::Error::new_spanned(namevalue, msg));
}
match ident.unwrap().to_string().to_lowercase().as_str() {
"worker_threads" => {
config.set_worker_threads(namevalue.lit.clone(), namevalue.span())?;
if let syn::Expr::Lit(expr_lit) = &namevalue.value {
config.set_worker_threads(expr_lit.lit.clone(), namevalue.span())?;
} else {
return Err(syn::Error::new_spanned(
&namevalue.value,
"Expected a literal value",
));
}
}
"flavor" => {
config.set_flavor(namevalue.lit.clone(), namevalue.span())?;
if let syn::Expr::Lit(expr_lit) = &namevalue.value {
config.set_flavor(expr_lit.lit.clone(), namevalue.span())?;
} else {
return Err(syn::Error::new_spanned(
&namevalue.value,
"Expected a literal value",
));
}
}
"core_threads" => {
let msg = "Attribute `core_threads` is renamed to `worker_threads`";
Expand All @@ -179,7 +193,7 @@ fn parse_knobs(
}
}
}
syn::NestedMeta::Meta(syn::Meta::Path(path)) => {
syn::Meta::Path(path) => {
let ident = path.get_ident();
if ident.is_none() {
let msg = "Must have specified ident";
Expand Down Expand Up @@ -279,7 +293,8 @@ fn parse_knobs(
#[cfg(not(test))] // Work around for rust-lang/rust#62127
pub(crate) fn main(args: TokenStream, item: TokenStream, rt_multi_thread: bool) -> TokenStream {
let input = syn::parse_macro_input!(item as syn::ItemFn);
let args = syn::parse_macro_input!(args as syn::AttributeArgs);
let args = syn::parse_macro_input!(args with syn::punctuated::Punctuated::<syn::Meta, syn::Token![,]>::parse_terminated);
let args: Vec<syn::Meta> = args.into_iter().collect();

if input.sig.ident == "main" && !input.sig.inputs.is_empty() {
let msg = "the main function cannot accept arguments";
Expand Down
Loading