msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-04-20 06:54:46 +00:00
Code Issues Releases Activity Actions

default to NoContent when method has no return type

Browse source
This commit is contained in:
Dominic 2019-10-05 14:56:51 +02:00
parent 5a62af6319
commit a28ccb98f1
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gotham_restful_derive/src/method.rs
View file

@ -59,9 +59,9 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
let ident = parse_macro_input!(attrs as Ident);
let fun = parse_macro_input!(item as ItemFn);
let ret = match fun.sig.output {
ReturnType::Default => quote!(()),
ReturnType::Type(_, ty) => quote!(#ty)
let (ret, is_no_content) = match fun.sig.output {
ReturnType::Default => (quote!(::gotham_restful::NoContent), true),
ReturnType::Type(_, ty) => (quote!(#ty), false)
};
let args : Vec<(TokenStream2, TokenStream2)> = fun.sig.inputs.iter().map(|arg| match arg {
FnArg::Typed(arg) => {
@ -79,7 +79,11 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
}
generics.push(quote!(#ret));
let args : Vec<TokenStream2> = args.into_iter().map(|(pat, ty)| quote!(#pat : #ty)).collect();
let block = fun.block;
let block = fun.block.stmts;
let ret_stmt = match is_no_content {
true => Some(quote!(().into())),
false => None
};
let trait_ident = method.trait_ident();
let fn_ident = method.fn_ident();
@ -89,7 +93,10 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
where #ident : ::gotham_restful::Resource
{
fn #fn_ident(#(#args),*) -> #ret
#block
{
#(#block)*
#ret_stmt
}
}
};
output.into()