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

Merge remote-tracking branch 'remotes/origin/master' into renamed_missing_field

Browse Source
This commit is contained in:
Erick Tryzelaar
2016-04-12 08:24:34 -07:00
parent f659fa8919 a84b6aaedd
commit 1c5d83889c
10 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/attr.rs
+4 -4
View File
@@ -191,7 +191,7 @@ impl FieldAttrs {
is_enum: bool) -> Result<Self, Error> {
let builder = AstBuilder::new();
let field_ident = match field.node.ident() {
let field_ident = match field.ident {
Some(ident) => ident,
None => { cx.span_bug(field.span, "struct field has no name?") }
};
@@ -205,7 +205,7 @@ impl FieldAttrs {
deserialize_with: None,
};
for meta_items in field.node.attrs.iter().filter_map(get_serde_meta_items) {
for meta_items in field.attrs.iter().filter_map(get_serde_meta_items) {
for meta_item in meta_items {
match meta_item.node {
// Parse `#[serde(rename="foo")]`
@@ -273,7 +273,7 @@ impl FieldAttrs {
ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"deserialize_with" => {
let expr = wrap_deserialize_with(
cx,
&field.node.ty,
&field.ty,
generics,
try!(parse_lit_into_path(cx, name, lit)),
);
@@ -614,7 +614,7 @@ fn wrap_deserialize_with(cx: &ExtCtxt,
}
impl $generics ::serde::de::Deserialize for $ty_path $where_clause {
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
fn deserialize<D>(deserializer: &mut D) -> ::std::result::Result<Self, D::Error>
where D: ::serde::de::Deserializer
{
let value = try!($path(deserializer));