macro update

This commit is contained in:
2025-07-14 20:39:06 -04:00
parent 8264838b2c
commit 716a72fffd

View File

@ -2,11 +2,14 @@ use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::{parse_macro_input, ItemEnum, DeriveInput, Data}; use syn::{parse_macro_input, ItemEnum, DeriveInput, Data};
#[proc_macro_attribute] #[proc_macro_attribute]
pub fn http_response(_attr: TokenStream, item: TokenStream) -> TokenStream { pub fn http_response(_attr: TokenStream, item: TokenStream) -> TokenStream {
let item_for_ast = item.clone(); // for parse_macro_input // Clone the input token stream for separate parsing uses
let item_for_quote = item.clone(); // for syn::parse to quote let item_for_ast = item.clone();
let item_for_quote = item.clone();
// Parse the input into a syntax tree
let ast: DeriveInput = parse_macro_input!(item_for_ast as DeriveInput); let ast: DeriveInput = parse_macro_input!(item_for_ast as DeriveInput);
let name = &ast.ident; let name = &ast.ident;
@ -15,9 +18,9 @@ pub fn http_response(_attr: TokenStream, item: TokenStream) -> TokenStream {
quote! { quote! {
impl Responsable for #name impl Responsable for #name
where where
Self: serde::de::DeserializeOwned, Self: serde::de::DeserializeOwned + Sized,
{ {
fn receive(resp: actix_web::ClientResponse) -> Result<Self, std::error::Error> { fn receive(resp: actix_web::ClientResponse) -> Result<Self, Box<dyn std::error::Error>> {
let parsed = actix_web::rt::System::new() let parsed = actix_web::rt::System::new()
.block_on(async { .block_on(async {
resp.json::<Self>().await resp.json::<Self>().await
@ -36,34 +39,36 @@ pub fn http_response(_attr: TokenStream, item: TokenStream) -> TokenStream {
syn::Fields::Unnamed(fields) if fields.unnamed.len() == 1 => { syn::Fields::Unnamed(fields) if fields.unnamed.len() == 1 => {
let inner_ty = &fields.unnamed.first().unwrap().ty; let inner_ty = &fields.unnamed.first().unwrap().ty;
Some(quote! { Some(quote! {
if let Ok(inner) = <#inner_ty as Responsable>::receive(resp) { if let Ok(inner) = <#inner_ty as Responsable>::receive(resp.clone()) {
return Ok(#name::#vname(inner)); return Ok(#name::#vname(inner));
} }
}) })
} }
_ => None _ => None,
} }
}); });
quote! { quote! {
impl Responsable for #name { impl Responsable for #name {
fn receive(resp: actix_web::ClientResponse) -> Result<Self, std::error::Error> { fn receive(resp: actix_web::ClientResponse) -> Result<Self, Box<dyn std::error::Error>> {
#(#variant_arms)* #(#variant_arms)*
Err(std::io::Error::new( Err(Box::new(std::io::Error::new(
std::io::ErrorKind::Other, std::io::ErrorKind::Other,
concat!("No matching enum variant in ", stringify!(#name)) concat!("No matching enum variant in ", stringify!(#name))
).into()) )))
} }
} }
} }
} }
_ => panic!("#[HttpResponse] only supports structs and tuple-style enum variants"), _ => panic!("#[http_response] only supports structs and tuple-style enum variants"),
}; };
// Parse the original item (struct or enum) for output
let original: syn::Item = syn::parse(item_for_quote).expect("Failed to parse item as syn::Item"); let original: syn::Item = syn::parse(item_for_quote).expect("Failed to parse item as syn::Item");
// Combine the original item and the impl block into final tokens
let output = quote! { let output = quote! {
#original #original
#impl_block #impl_block
@ -71,7 +76,6 @@ pub fn http_response(_attr: TokenStream, item: TokenStream) -> TokenStream {
output.into() output.into()
} }
#[proc_macro_derive(ResponseVec)] #[proc_macro_derive(ResponseVec)]
pub fn derive_response_vec(input: TokenStream) -> TokenStream { pub fn derive_response_vec(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput); let input = parse_macro_input!(input as DeriveInput);