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

simplify error reporting

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-08-05 23:02:15 -04:00
parent 14d2254b2b
commit 005b124cd3
8 changed files with 120 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_macros/src/lib.rs
+9 -9
View File
@@ -320,7 +320,7 @@ fn deserialize_struct(
match $token {
::serde::de::StructStart(_, _) => $struct_block,
::serde::de::MapStart(_) => $map_block,
token => $deserializer.syntax_error(token),
token => Err($deserializer.syntax_error(token)),
}
)
}
@@ -430,7 +430,9 @@ fn deserialize_struct_from_map(
let pat = cx.pat_tuple(span, pats);
let s = cx.expr_str(span, token::get_ident(name));
quote_arm!(cx, $pat => { return $deserializer.missing_field_error($s); })
quote_arm!(cx,
$pat => Err($deserializer.missing_field_error($s)),
)
})
.collect();
@@ -447,7 +449,7 @@ fn deserialize_struct_from_map(
let key = match token {
::serde::de::Str(s) => s,
::serde::de::String(ref s) => s.as_slice(),
token => { return $deserializer.syntax_error(token); }
token => { return Err($deserializer.syntax_error(token)); }
};
match key {
@@ -457,16 +459,14 @@ fn deserialize_struct_from_map(
};
if error {
return $deserializer.syntax_error(token);
return Err($deserializer.syntax_error(token));
}
}
let result = match $fields_tuple {
$fields_pat => $result,
match $fields_tuple {
$fields_pat => Ok($result),
$error_arms
};
Ok(result)
}
})
}