diff --git a/yaserde/tests/enum.rs b/yaserde/tests/enum.rs
index 3c0a300..8c93a13 100644
--- a/yaserde/tests/enum.rs
+++ b/yaserde/tests/enum.rs
@@ -158,7 +158,9 @@ fn attribute_enum2() {
impl Default for Child1 {
fn default() -> Child1 {
- Child1{val: "hello world".into()}
+ Child1 {
+ val: "hello world".into(),
+ }
}
}
@@ -171,22 +173,24 @@ fn attribute_enum2() {
impl Default for Child2 {
fn default() -> Child2 {
- Child2{num: 0}
+ Child2 { num: 0 }
}
}
#[derive(Debug, PartialEq, YaSerialize, YaDeserialize)]
#[yaserde(flatten)]
enum Base {
- #[yaserde(flatten, rename="child1")]
+ #[yaserde(flatten, rename = "child1")]
C1(Child1),
- #[yaserde(flatten, rename="child2")]
+ #[yaserde(flatten, rename = "child2")]
C2(Child2),
}
impl Default for Base {
fn default() -> Base {
- Base::C1(Child1{val: "hello world".into()})
+ Base::C1(Child1 {
+ val: "hello world".into(),
+ })
}
}
@@ -199,8 +203,8 @@ fn attribute_enum2() {
deserialize_and_validate!(content, model, Base);
let content = r#""#;
- let model = Base::C2(Child2{ num: 7 });
-
+ let model = Base::C2(Child2 { num: 7 });
+
serialize_and_validate!(model, content);
deserialize_and_validate!(content, model, Base);
@@ -213,7 +217,9 @@ fn attribute_enum2() {
impl Default for Base2 {
fn default() -> Base2 {
- Base2::C1(Child1{val: "hello world".into()})
+ Base2::C1(Child1 {
+ val: "hello world".into(),
+ })
}
}
diff --git a/yaserde/tests/skip.rs b/yaserde/tests/skip.rs
index b9879ff..93683cb 100644
--- a/yaserde/tests/skip.rs
+++ b/yaserde/tests/skip.rs
@@ -39,11 +39,10 @@ fn skip_serializing_for_nested_struct() {
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "child")]
- pub struct XmlStructChild {
- }
+ pub struct XmlStructChild {}
let model = XmlStruct {
- skipped_serializing: XmlStructChild{},
+ skipped_serializing: XmlStructChild {},
};
let content = "";
@@ -64,7 +63,7 @@ fn skip_serializing_for_enum() {
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "child")]
pub enum XmlEnum {
- Ok
+ Ok,
}
let model = XmlStruct {
@@ -87,10 +86,9 @@ fn skip_serializing_for_vec() {
}
let model = XmlStruct {
- skipped_serializing: vec![1,2,3],
+ skipped_serializing: vec![1, 2, 3],
};
let content = "";
serialize_and_validate!(model, content);
}
-
diff --git a/yaserde/tests/skip_if.rs b/yaserde/tests/skip_if.rs
index 14d5076..d3394c0 100644
--- a/yaserde/tests/skip_if.rs
+++ b/yaserde/tests/skip_if.rs
@@ -127,23 +127,20 @@ fn skip_serializing_if_for_nested_struct() {
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "base")]
pub struct XmlStruct {
- #[yaserde(skip_serializing_if="check_child")]
+ #[yaserde(skip_serializing_if = "check_child")]
skipped_serializing: XmlStructChild,
}
- impl XmlStruct
- {
- fn check_child(&self, _child:&XmlStructChild)->bool
- {
+ impl XmlStruct {
+ fn check_child(&self, _child: &XmlStructChild) -> bool {
true
}
}
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "child")]
- pub struct XmlStructChild {
- }
+ pub struct XmlStructChild {}
let model = XmlStruct {
- skipped_serializing: XmlStructChild{},
+ skipped_serializing: XmlStructChild {},
};
let content = "";
@@ -157,20 +154,18 @@ fn skip_serializing_if_for_enum() {
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "base")]
pub struct XmlStruct {
- #[yaserde(skip_serializing_if="check_enum")]
+ #[yaserde(skip_serializing_if = "check_enum")]
skipped_serializing: XmlEnum,
}
- impl XmlStruct
- {
- fn check_enum(&self, _child:&XmlEnum)->bool
- {
+ impl XmlStruct {
+ fn check_enum(&self, _child: &XmlEnum) -> bool {
true
}
}
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "child")]
pub enum XmlEnum {
- Ok
+ Ok,
}
let model = XmlStruct {
@@ -188,20 +183,18 @@ fn skip_serializing_if_for_vec() {
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "base")]
pub struct XmlStruct {
- #[yaserde(skip_serializing_if="check_vec")]
+ #[yaserde(skip_serializing_if = "check_vec")]
skipped_serializing: Vec,
}
- impl XmlStruct
- {
- fn check_vec(&self, _child:&Vec)->bool
- {
+ impl XmlStruct {
+ fn check_vec(&self, _child: &Vec) -> bool {
true
}
}
let model = XmlStruct {
- skipped_serializing: vec![1,2,3],
+ skipped_serializing: vec![1, 2, 3],
};
let content = "";
serialize_and_validate!(model, content);
-}
\ No newline at end of file
+}
diff --git a/yaserde_derive/src/ser/expand_enum.rs b/yaserde_derive/src/ser/expand_enum.rs
index ea97fd5..18ce4b5 100644
--- a/yaserde_derive/src/ser/expand_enum.rs
+++ b/yaserde_derive/src/ser/expand_enum.rs
@@ -108,7 +108,7 @@ fn inner_enum_inspector(
let label = &variant.ident;
let label_name = build_label_name(label, &variant_attrs, &root_attributes.default_namespace);
-
+
match variant.fields {
Fields::Unit => quote! {
name::#label => {