berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify code generation + remove uppercase conversion 

* assume HTTP methods always specified in uppercase e.g `GET`
* simplify code generation by quote!
This commit is contained in:
Matt Gathu 2020-09-13 11:29:15 +02:00
parent c5c8d21c84
commit 90a6b47927
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
actix-web-codegen/src/route.rs
View File

@ -102,7 +102,7 @@ impl Args {
} }
} else if nv.path.is_ident("method") { } else if nv.path.is_ident("method") {
if let syn::Lit::Str(ref lit) = nv.lit { if let syn::Lit::Str(ref lit) = nv.lit {
match lit.value().to_uppercase().as_str() { match lit.value().as_str() {
"CONNECT" => methods.push(GuardType::Connect), "CONNECT" => methods.push(GuardType::Connect),
"DELETE" => methods.push(GuardType::Delete), "DELETE" => methods.push(GuardType::Delete),
"GET" => methods.push(GuardType::Get), "GET" => methods.push(GuardType::Get),
@ -202,7 +202,7 @@ impl Route {
if guard == GuardType::Multi && args.methods.is_empty() { if guard == GuardType::Multi && args.methods.is_empty() {
return Err(syn::Error::new( return Err(syn::Error::new(
Span::call_site(), Span::call_site(),
"The #[route(..)] macro requires at least one `method` attribute!", "The #[route(..)] macro requires at least one `method` attribute",
)); ));
} }
@ -246,42 +246,32 @@ impl ToTokens for Route {
resource_type, resource_type,
} = self; } = self;
let resource_name = name.to_string(); let resource_name = name.to_string();
let stream = if guard != &GuardType::Multi {
let guard_gen = if guard == &GuardType::Multi {
quote! { quote! {
#[allow(non_camel_case_types, missing_docs)] .guard(actix_web::guard::AnyGuard::new(vec![#(Box::new(actix_web::guard::#methods())),*]))
pub struct #name;
impl actix_web::dev::HttpServiceFactory for #name {
fn register(self, __config: &mut actix_web::dev::AppService) {
#ast
let __resource = actix_web::Resource::new(#path)
.name(#resource_name)
.guard(actix_web::guard::#guard())
#(.guard(actix_web::guard::fn_guard(#guards)))*
#(.wrap(#wrappers))*
.#resource_type(#name);
actix_web::dev::HttpServiceFactory::register(__resource, __config)
}
}
} }
} else { } else {
quote! { quote! {
#[allow(non_camel_case_types, missing_docs)] .guard(actix_web::guard::#guard())
pub struct #name; }
};
impl actix_web::dev::HttpServiceFactory for #name { let stream = quote! {
fn register(self, __config: &mut actix_web::dev::AppService) { #[allow(non_camel_case_types, missing_docs)]
#ast pub struct #name;
let __resource = actix_web::Resource::new(#path)
.name(#resource_name)
.guard(actix_web::guard::AnyGuard::new(vec![#(Box::new(actix_web::guard::#methods())),*]))
#(.guard(actix_web::guard::fn_guard(#guards)))*
#(.wrap(#wrappers))*
.#resource_type(#name);
actix_web::dev::HttpServiceFactory::register(__resource, __config) impl actix_web::dev::HttpServiceFactory for #name {
} fn register(self, __config: &mut actix_web::dev::AppService) {
#ast
let __resource = actix_web::Resource::new(#path)
.name(#resource_name)
#guard_gen
#(.guard(actix_web::guard::fn_guard(#guards)))*
#(.wrap(#wrappers))*
.#resource_type(#name);
actix_web::dev::HttpServiceFactory::register(__resource, __config)
} }
} }
}; };