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

fix a little string & use map_or_else instead of if-else

This commit is contained in:
Richard Chien 2021-02-05 10:41:01 +08:00
parent 2430ea9d9e
commit 3496be9d0c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ impl Args {
} else { } else {
return Err(syn::Error::new_spanned( return Err(syn::Error::new_spanned(
nv.lit, nv.lit,
"Attribute endpoint expects literal string!", "Attribute name expects literal string!",
)); ));
} }
} else if nv.path.is_ident("guard") { } else if nv.path.is_ident("guard") {
@ -296,11 +296,9 @@ impl ToTokens for Route {
resource_type, resource_type,
doc_attributes, doc_attributes,
} = self; } = self;
let resource_name = if let Some(resource_name) = resource_name { let resource_name = resource_name
resource_name.value() .as_ref()
} else { .map_or_else(|| name.to_string(), |n| n.value());
name.to_string()
};
let method_guards = { let method_guards = {
let mut others = methods.iter(); let mut others = methods.iter();
// unwrapping since length is checked to be at least one // unwrapping since length is checked to be at least one