mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from oli-obk/missing_renamed_field

Browse Source 
missing field errors displayed original field name instead of renamed
This commit is contained in:
Erick Tryzelaar 2015-04-26 08:09:00 -07:00
commit 3b44792ff3
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serde_macros/src/de.rs
View File

@ -639,9 +639,11 @@ fn deserialize_map(
let extract_values: Vec<P<ast::Stmt>> = field_names.iter() let extract_values: Vec<P<ast::Stmt>> = field_names.iter()
.zip(struct_def.fields.iter()) .zip(struct_def.fields.iter())
.map(|(field_name, field)| { .map(|(field_name, field)| {
let name_str = match field.node.kind { let rename = field::field_rename(field, &field::Direction::Deserialize);
ast::NamedField(name, _) => builder.expr().str(name), let name_str = match (rename, field.node.kind) {
ast::UnnamedField(_) => panic!("struct contains unnamed fields"), (Some(rename), _) => builder.expr().build_lit(P(rename.clone())),
(None, ast::NamedField(name, _)) => builder.expr().str(name),
(None, ast::UnnamedField(_)) => panic!("struct contains unnamed fields"),
}; };
let missing_expr = if field::default_value(field) { let missing_expr = if field::default_value(field) {

2
serde_macros/src/field.rs
View File

@ -10,7 +10,7 @@ pub enum Direction {
Deserialize, Deserialize,
} }
fn field_rename<'a>( pub fn field_rename<'a>(
field: &'a ast::StructField, field: &'a ast::StructField,
direction: &Direction, direction: &Direction,
) -> Option<&'a ast::Lit> { ) -> Option<&'a ast::Lit> {

25
tests/test_json.rs
View File

@ -1,4 +1,4 @@
#![feature(custom_derive, plugin, test)] #![feature(custom_derive, plugin, test, custom_attribute)]
#![plugin(serde_macros)] #![plugin(serde_macros)]
extern crate test; extern crate test;
@ -1019,3 +1019,26 @@ fn test_missing_field() {
))).unwrap(); ))).unwrap();
assert_eq!(value, Foo { x: Some(5) }); assert_eq!(value, Foo { x: Some(5) });
} }
#[test]
fn test_missing_renamed_field() {
#[derive(Debug, PartialEq, Deserialize)]
struct Foo {
#[serde(rename_deserialize="y")]
x: Option<u32>,
}
let value: Foo = from_str("{}").unwrap();
assert_eq!(value, Foo { x: None });
let value: Foo = from_str("{\"y\": 5}").unwrap();
assert_eq!(value, Foo { x: Some(5) });
let value: Foo = from_value(Value::Object(treemap!())).unwrap();
assert_eq!(value, Foo { x: None });
let value: Foo = from_value(Value::Object(treemap!(
"y".to_string() => Value::I64(5)
))).unwrap();
assert_eq!(value, Foo { x: Some(5) });
}