NationTech/yaserde
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Before formatting

Browse Source
This commit is contained in:
Horaci Macias 2020-07-21 09:36:55 +02:00
parent c76ad9fe59
commit c2d9a9fb64
2 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
yaserde/tests/serializer.rs
View File

@ -88,12 +88,12 @@ fn ser_list_of_items() {
#[derive(YaSerialize, PartialEq, Debug)] #[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "base")] #[yaserde(rename = "base")]
pub struct XmlStructOfStructRenamedFlattenedField { pub struct XmlStructOfStructNonFlattenedField {
//#[yaserde(flatten)] //#[yaserde(flatten)]
items: Vec<SubStruct>, items: Vec<SubStruct>,
} }
let model3 = XmlStructOfStructRenamedFlattenedField { let model3 = XmlStructOfStructNonFlattenedField {
items: vec![ items: vec![
SubStruct { SubStruct {
field: "something1".to_string(), field: "something1".to_string(),
@ -104,10 +104,30 @@ fn ser_list_of_items() {
], ],
}; };
// SubStruct has 'rename' set, but it's ignored because SubStruct is used as a field of XmlStructOfStructRenamedFlattenedField that overrides the 'rename
let content = "<base><items><field>something1</field></items><items><field>something2</field></items></base>"; let content = "<base><items><field>something1</field></items><items><field>something2</field></items></base>";
//let content = "<base><field>something1</field><field>something2</field></base>";
serialize_and_validate!(model3, content); serialize_and_validate!(model3, content);
#[derive(YaSerialize, PartialEq, Debug)]
#[yaserde(rename = "base")]
pub struct XmlStructOfStructFlattenedField {
#[yaserde(flatten)]
items: Vec<SubStruct>,
}
let model3 = XmlStructOfStructFlattenedField {
items: vec![
SubStruct {
field: "something1".to_string(),
},
SubStruct {
field: "something2".to_string(),
},
],
};
// SubStruct has 'rename' set, but it's ignored because SubStruct is used as a field of XmlStructOfStructRenamedFlattenedField that overrides the 'rename
let content = "<base><field>something1</field><field>something2</field></base>";
serialize_and_validate!(model3, content);
} }
#[test] #[test]

47
yaserde_derive/src/ser/expand_struct.rs
View File

@ -268,26 +268,35 @@ pub fn serialize(
} }
}), }),
Field::FieldStruct { .. } => { Field::FieldStruct { .. } => {
Some(quote! { if field.is_flatten() {
//&self.#label Some(quote! {
for item in &self.#label { for item in &self.#label {
writer.set_start_event_name(Some(#label_name.to_string())); writer.set_start_event_name(None);
writer.set_skip_start_end(false); writer.set_skip_start_end(true);
item.serialize(writer)?; item.serialize(writer)?;
}
})
} else {
Some(quote! {
for item in &self.#label {
writer.set_start_event_name(Some(#label_name.to_string()));
writer.set_skip_start_end(false);
item.serialize(writer)?;
}
})
} }
}) /*let (start_event, skip_start) = if field.is_flatten() {
// let (start_event, skip_start) = if field.is_flatten() { (quote!(None), true)
// (quote!(None), true) } else {
// } else { (quote!(Some(#label_name.to_string())), false)
// (quote!(Some(#label_name.to_string())), false) };
// };
// Some(quote! {
// Some(quote! { writer.set_start_event_name(#start_event);
// writer.set_start_event_name(#start_event); writer.set_skip_start_end(#skip_start);
// writer.set_skip_start_end(#skip_start); self.#label.serialize(writer)?;
// self.#label.serialize(writer)?; })*/
// }) }
},
Field::FieldVec { .. } => { Field::FieldVec { .. } => {
unimplemented!(); unimplemented!();
} }