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

Various fixes in actix-web-codegen crate

This commit is contained in:
Igor Aleksanov 2021-06-22 19:12:53 +03:00
parent ee2fb80deb
commit 282a66f327
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ use std::convert::TryFrom;
use proc_macro::TokenStream; use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2}; use proc_macro2::{Span, TokenStream as TokenStream2};
use quote::{format_ident, quote, ToTokens, TokenStreamExt}; use quote::{format_ident, quote, ToTokens, TokenStreamExt};
use syn::{parse_macro_input, AttributeArgs, Ident, NestedMeta}; use syn::{parse_macro_input, AttributeArgs, Ident, LitStr, NestedMeta};
enum ResourceType { enum ResourceType {
Async, Async,
@ -227,8 +227,7 @@ impl Route {
format!( format!(
r#"invalid service definition, expected #[{}("<some path>")]"#, r#"invalid service definition, expected #[{}("<some path>")]"#,
method method
.map(|it| it.as_str()) .map_or("route", |it| it.as_str())
.unwrap_or("route")
.to_ascii_lowercase() .to_ascii_lowercase()
), ),
)); ));
@ -298,7 +297,7 @@ impl ToTokens for Route {
} = self; } = self;
let resource_name = resource_name let resource_name = resource_name
.as_ref() .as_ref()
.map_or_else(|| name.to_string(), |n| n.value()); .map_or_else(|| name.to_string(), LitStr::value);
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