pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-22 14:57:59 +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/attr.rs
-22
View File
@@ -167,8 +167,6 @@ pub struct FieldAttrs {
deserialize_name: Option<ast::Lit>,
skip_serializing_field: bool,
skip_serializing_field_if: Option<P<ast::Expr>>,
skip_serializing_field_if_empty: bool,
skip_serializing_field_if_none: bool,
default_expr_if_missing: Option<P<ast::Expr>>,
serialize_with: Option<P<ast::Expr>>,
deserialize_with: Option<P<ast::Expr>>,
@@ -193,8 +191,6 @@ impl FieldAttrs {
deserialize_name: None,
skip_serializing_field: false,
skip_serializing_field_if: None,
skip_serializing_field_if_empty: false,
skip_serializing_field_if_none: false,
default_expr_if_missing: None,
serialize_with: None,
deserialize_with: None,
@@ -251,16 +247,6 @@ impl FieldAttrs {
field_attrs.skip_serializing_field_if = Some(expr);
}
// Parse `#[serde(skip_serializing_if_none)]`
ast::MetaItemKind::Word(ref name) if name == &"skip_serializing_if_none" => {
field_attrs.skip_serializing_field_if_none = true;
}
// Parse `#[serde(skip_serializing_if_empty)]`
ast::MetaItemKind::Word(ref name) if name == &"skip_serializing_if_empty" => {
field_attrs.skip_serializing_field_if_empty = true;
}
// Parse `#[serde(serialize_with="...")]`
ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"serialize_with" => {
let expr = wrap_serialize_with(
@@ -345,14 +331,6 @@ impl FieldAttrs {
self.skip_serializing_field_if.as_ref()
}
pub fn skip_serializing_field_if_empty(&self) -> bool {
self.skip_serializing_field_if_empty
}
pub fn skip_serializing_field_if_none(&self) -> bool {
self.skip_serializing_field_if_none
}
pub fn serialize_with(&self) -> Option<&P<ast::Expr>> {
self.serialize_with.as_ref()
}
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)
}
}
})