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

Fully qualify some calls in generated code and fix a bad comment

Browse Source
This commit is contained in:
Armin Ronacher 2018-03-20 13:35:16 +01:00
parent 6e324e887d
commit abeea89147
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serde_derive/src/ser.rs
View File

@ -303,7 +303,7 @@ fn serialize_struct_as_map(params: &Parameters, fields: &[Field], cattrs: &attr:
let let_mut = mut_if(serialized_fields.peek().is_some());
let len = if cattrs.has_flatten() {
quote!(None)
quote!(_serde::export::None)
} else {
let len = serialized_fields
.map(|field| match field.attrs.skip_serializing_if() {
@ -315,7 +315,7 @@ fn serialize_struct_as_map(params: &Parameters, fields: &[Field], cattrs: &attr:
}
})
.fold(quote!(0), |sum, expr| quote!(#sum + #expr));
quote!(Some(#len))
quote!(_serde::export::Some(#len))
};
quote_block! {
@ -926,7 +926,7 @@ fn serialize_struct_visitor(
let span = Span::def_site().located_at(field.original.span());
let ser = if field.attrs.flatten() {
quote! {
try!((#field_expr).serialize(_serde::private::ser::FlatMapSerializer(&mut __serde_state)));
try!(_serde::Serialize::serialize(&#field_expr, _serde::private::ser::FlatMapSerializer(&mut __serde_state)));
}
} else {
let func = struct_trait.serialize_field(span);

2
serde_derive_internals/src/attr.rs
View File

@ -891,7 +891,7 @@ impl Field {
}
}
// Parse `#[serde(skip_deserializing)]`
// Parse `#[serde(flatten)]`
Meta(Word(word)) if word == "flatten" => {
flatten.set_true();
}