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

Renamed to 'data' to 'content_type'.

This commit is contained in:
Sergio Benitez 2016-08-22 19:21:59 -07:00
parent 8adf9f7c46
commit c8eef33820
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macros/src/meta_item_parser.rs
View File

@ -122,7 +122,7 @@ pub struct RouteParams {
pub method: Spanned<Method>,
pub path: KVSpanned<String>,
pub form: Option<KVSpanned<String>>,
pub data: Option<KVSpanned<String>>,
pub content_type: Option<KVSpanned<String>>,
}
pub trait RouteDecoratorExt {
@ -173,7 +173,7 @@ impl<'a, 'c> RouteDecoratorExt for MetaItemParser<'a, 'c> {
// Now grab all of the required and optional parameters.
let req: [&'static str; 1] = ["path"];
let opt: [&'static str; 2] = ["form", "data"];
let opt: [&'static str; 2] = ["form", "content"];
let kv_pairs = get_key_values(self.ctxt, self.meta_item.span,
&req, &opt, kv_params);
@ -205,17 +205,17 @@ impl<'a, 'c> RouteDecoratorExt for MetaItemParser<'a, 'c> {
Some(f.clone().map(String::from))
});
let data = kv_pairs.get("data").and_then(|data| {
let content_type = kv_pairs.get("content").and_then(|data| {
Some(data.clone().map(String::from))
});
debug!("Found data: {:?}", data);
debug!("Found data: {:?}", content_type);
RouteParams {
method: method,
path: path,
form: form,
data: data
content_type: content_type,
}
}