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

feat(codegen): Remove #[serde(skip_serializing_if_{none,empty})]

Browse Source 
`#[serde(skip_serializing_if="...")]` can replace this functionality.
This commit is contained in:
Erick Tryzelaar
2016-02-18 19:31:43 -08:00
parent 40f8e6b061
commit c268eb2258
3 changed files with 16 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/src/ser.rs
+12 -32
View File
@@ -657,19 +657,10 @@ fn serialize_struct_visitor(
let key_expr = field_attr.serialize_name_expr();
let stmt = match field_attr.skip_serializing_field_if() {
Some(expr) => {
let stmt = if let Some(expr) = field_attr.skip_serializing_field_if() {
Some(quote_stmt!(cx, if $expr { continue; }))
}
None => {
if field_attr.skip_serializing_field_if_empty() {
Some(quote_stmt!(cx, if self.value.$name.is_empty() { continue; }))
} else if field_attr.skip_serializing_field_if_none() {
Some(quote_stmt!(cx, if self.value.$name.is_none() { continue; }))
} else {
None
}
}
} else {
None
};
let field_expr = match field_attr.serialize_with() {
@@ -702,26 +693,15 @@ fn serialize_struct_visitor(
.strip_bounds()
.build();
let len = fields.iter().zip(field_attrs.iter())
.map(|(field, field_attr)| {
if field_attr.skip_serializing_field() {
quote_expr!(cx, 0)
} else {
match field_attr.skip_serializing_field_if() {
Some(expr) => {
quote_expr!(cx, if $expr { 0 } else { 1 })
}
None => {
let name = field.node.ident().expect("struct has unnamed field");
if field_attr.skip_serializing_field_if_empty() {
quote_expr!(cx, if self.value.$name.is_empty() { 0 } else { 1 })
} else if field_attr.skip_serializing_field_if_none() {
quote_expr!(cx, if self.value.$name.is_none() { 0 } else { 1 })
} else {
quote_expr!(cx, 1)
}
}
let len = field_attrs.iter()
.filter(|field_attr| !field_attr.skip_serializing_field())
.map(|field_attr| {
match field_attr.skip_serializing_field_if() {
Some(expr) => {
quote_expr!(cx, if $expr { 0 } else { 1 })
}
None => {
quote_expr!(cx, 1)
}
}
})