msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

workaround for #7: no state when using conn

Browse source
This commit is contained in:
Dominic 2020-01-14 23:32:16 +01:00
parent 876da721f8
commit 26cbe28b00
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gotham_restful/src/lib.rs
View file

@ -123,7 +123,7 @@ pub use gotham_restful_derive::*;
pub mod export pub mod export
{ {
pub use futures::future::Future; pub use futures::future::Future;
pub use gotham::state::FromState; pub use gotham::state::{FromState, State};
#[cfg(feature = "database")] #[cfg(feature = "database")]
pub use gotham_middleware_diesel::Repo; pub use gotham_middleware_diesel::Repo;

36
gotham_restful_derive/src/method.rs
View file

@ -104,11 +104,11 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
// extract arguments into pattern, ident and type // extract arguments into pattern, ident and type
let state_ident = format_ident!("state"); let state_ident = format_ident!("state");
let args : Vec<(TokenStream2, Ident, Type)> = fun.sig.inputs.iter().enumerate().map(|(i, arg)| match arg { let args : Vec<(usize, TokenStream2, Ident, Type)> = fun.sig.inputs.iter().enumerate().map(|(i, arg)| match arg {
FnArg::Typed(arg) => { FnArg::Typed(arg) => {
let pat = &arg.pat; let pat = &arg.pat;
let ident = if i == 0 { state_ident.clone() } else { format_ident!("arg{}", i-1) }; let ident = format_ident!("arg{}", i);
(quote!(#pat), ident, *arg.ty.clone()) (i, quote!(#pat), ident, *arg.ty.clone())
}, },
FnArg::Receiver(_) => panic!("didn't expect self parameter") FnArg::Receiver(_) => panic!("didn't expect self parameter")
}).collect(); }).collect();
@ -116,31 +116,35 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
// find the database connection if enabled and present // find the database connection if enabled and present
let repo_ident = format_ident!("database_repo"); let repo_ident = format_ident!("database_repo");
let args_conn = if cfg!(feature = "database") { let args_conn = if cfg!(feature = "database") {
args.iter().filter(|(pat, _, _)| pat.to_string() == "conn").nth(0) args.iter().filter(|(_, pat, _, _)| pat.to_string() == "conn").nth(0)
} else { None }; } else { None };
let args_conn_name = args_conn.map(|(pat, _, _)| pat.to_string()); let args_conn_name = args_conn.map(|(_, pat, _, _)| pat.to_string());
// extract the generic parameters to use // extract the generic parameters to use
let mut generics : Vec<TokenStream2> = args.iter().skip(1) let mut generics : Vec<TokenStream2> = args.iter().skip(1)
.filter(|(pat, _, _)| Some(pat.to_string()) != args_conn_name) .filter(|(_, pat, _, _)| Some(pat.to_string()) != args_conn_name)
.map(|(_, _, ty)| quote!(#ty)).collect(); .map(|(_, _, _, ty)| quote!(#ty)).collect();
generics.push(quote!(#ret)); generics.push(quote!(#ret));
// extract the definition of our method // extract the definition of our method
let args_def : Vec<TokenStream2> = args.iter() let mut args_def : Vec<TokenStream2> = args.iter()
.filter(|(pat, _, _)| Some(pat.to_string()) != args_conn_name) .filter(|(_, pat, _, _)| Some(pat.to_string()) != args_conn_name)
.map(|(_, ident, ty)| quote!(#ident : #ty)).collect(); .map(|(i, _, ident, ty)| if *i == 0 { quote!(#state_ident : #ty) } else { quote!(#ident : #ty) }).collect();
if let Some(_) = args_conn
{
args_def.insert(0, quote!(#state_ident : &mut #krate::export::State));
}
// extract the arguments to pass over to the supplied method // extract the arguments to pass over to the supplied method
let args_pass : Vec<TokenStream2> = args.iter().map(|(pat, ident, _)| if Some(pat.to_string()) != args_conn_name { let args_pass : Vec<TokenStream2> = args.iter().map(|(i, pat, ident, _)| if Some(pat.to_string()) != args_conn_name {
quote!(#ident) if *i == 0 { quote!(#state_ident) } else { quote!(#ident) }
} else { } else {
quote!(&#ident) quote!(&#ident)
}).collect(); }).collect();
// prepare the method block // prepare the method block
let mut block = if is_no_content { quote!(#fun_ident(#(#args_pass),*); Default::default()) } else { quote!(#fun_ident(#(#args_pass),*)) }; let mut block = if is_no_content { quote!(#fun_ident(#(#args_pass),*); Default::default()) } else { quote!(#fun_ident(#(#args_pass),*)) };
if /*cfg!(feature = "database") &&*/ let Some((_, conn_ident, conn_ty)) = args_conn // https://github.com/rust-lang/rust/issues/53667 if /*cfg!(feature = "database") &&*/ let Some((_, _, conn_ident, conn_ty)) = args_conn // https://github.com/rust-lang/rust/issues/53667
{ {
let conn_ty_real = match conn_ty { let conn_ty_real = match conn_ty {
Type::Reference(ty) => &*ty.elem, Type::Reference(ty) => &*ty.elem,
@ -149,9 +153,9 @@ pub fn expand_method(method : Method, attrs : TokenStream, item : TokenStream) -
block = quote! { block = quote! {
use #krate::export::{Future, FromState}; use #krate::export::{Future, FromState};
let #repo_ident = <#krate::export::Repo<#conn_ty_real>>::borrow_from(&#state_ident).clone(); let #repo_ident = <#krate::export::Repo<#conn_ty_real>>::borrow_from(&#state_ident).clone();
#repo_ident.run(move |#conn_ident| { #repo_ident.run::<_, #ret, ()>(move |#conn_ident| {
#block Ok(#block)
}).wait() }).wait().unwrap()
}; };
} }