pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-27 05:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

structs should deserialize from a map

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-05-27 21:46:31 -07:00
parent bf58f7999f
commit c70e9f0eae
2 changed files with 91 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json.rs
+2 -20
View File
@@ -2288,17 +2288,7 @@ mod tests {
#[inline]
fn deserialize_token(d: &mut D, token: de::Token) -> Result<Inner, E> {
match token {
de::StructStart(name) => {
if name != "Inner" {
return Err(d.syntax_error());
}
let a = try!(d.expect_struct_field("a"));
let b = try!(d.expect_struct_field("b"));
let c = try!(d.expect_struct_field("c"));
try!(d.expect_end());
Ok(Inner { a: a, b: b, c: c })
}
de::StructStart("Inner") |
de::MapStart(_) => {
let mut a = None;
let mut b = None;
@@ -2360,15 +2350,7 @@ mod tests {
#[inline]
fn deserialize_token(d: &mut D, token: de::Token) -> Result<Outer, E> {
match token {
de::StructStart(name) => {
if name != "Outer" {
return Err(d.syntax_error());
}
let inner = try!(d.expect_struct_field("inner"));
try!(d.expect_end());
Ok(Outer { inner: inner })
}
de::StructStart("Outer") |
de::MapStart(_) => {
let mut inner = None;