rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistently prefix codegen variables with '__'. 

Closes #1656.
This commit is contained in:
Sergio Benitez 2021-05-29 13:32:56 -07:00
parent 1f1976f8bf
commit 2b8104ee2c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/codegen/src/attribute/route/mod.rs
View File

@ -75,7 +75,7 @@ fn query_decls(route: &Route) -> Option<TokenStream> {
#[allow(non_snake_case)] #[allow(non_snake_case)]
Some(quote! { Some(quote! {
let mut _e = #_form::Errors::new(); let mut __e = #_form::Errors::new();
#(let mut #ident = #init_expr;)* #(let mut #ident = #init_expr;)*
for _f in #__req.query_fields() { for _f in #__req.query_fields() {
@ -93,15 +93,15 @@ fn query_decls(route: &Route) -> Option<TokenStream> {
let #ident = match #finalize_expr { let #ident = match #finalize_expr {
#_Ok(_v) => #_Some(_v), #_Ok(_v) => #_Some(_v),
#_Err(_err) => { #_Err(_err) => {
_e.extend(_err.with_name(#_form::NameView::new(#name))); __e.extend(_err.with_name(#_form::NameView::new(#name)));
#_None #_None
}, },
}; };
)* )*
if !_e.is_empty() { if !__e.is_empty() {
#_log::warn_!("query string failed to match declared route"); #_log::warn_!("query string failed to match declared route");
for _err in _e { #_log::warn_!("{}", _err); } for _err in __e { #_log::warn_!("{}", _err); }
return #Outcome::Forward(#__data); return #Outcome::Forward(#__data);
} }
@ -122,8 +122,8 @@ fn request_guard_decl(guard: &Guard) -> TokenStream {
#_log::warn_!("`{}` request guard is forwarding.", stringify!(#ty)); #_log::warn_!("`{}` request guard is forwarding.", stringify!(#ty));
return #Outcome::Forward(#__data); return #Outcome::Forward(#__data);
}, },
#Outcome::Failure((__c, _e)) => { #Outcome::Failure((__c, __e)) => {
#_log::warn_!("`{}` request guard failed: {:?}.", stringify!(#ty), _e); #_log::warn_!("`{}` request guard failed: {:?}.", stringify!(#ty), __e);
return #Outcome::Failure(__c); return #Outcome::Failure(__c);
} }
}; };
@ -185,8 +185,8 @@ fn data_guard_decl(guard: &Guard) -> TokenStream {
#_log::warn_!("`{}` data guard is forwarding.", stringify!(#ty)); #_log::warn_!("`{}` data guard is forwarding.", stringify!(#ty));
return #Outcome::Forward(__d); return #Outcome::Forward(__d);
} }
#Outcome::Failure((__c, _e)) => { #Outcome::Failure((__c, __e)) => {
#_log::warn_!("`{}` data guard failed: {:?}.", stringify!(#ty), _e); #_log::warn_!("`{}` data guard failed: {:?}.", stringify!(#ty), __e);
return #Outcome::Failure(__c); return #Outcome::Failure(__c);
} }
}; };