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

Merge pull request #112 from ephraimkunz/same-child-name

Browse Source 
Fix bug where nested structs with the same element names don't deserialize properly.
This commit is contained in:
Marc-Antoine ARNAUD 2021-05-30 19:28:58 +02:00 committed by GitHub
commit a8ef1358a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yaserde/tests/deserializer.rs
View File

@ -1072,6 +1072,5 @@ fn de_same_field_name_but_some_other_fields_or_something() {
}; };
serialize_and_validate!(model, content); serialize_and_validate!(model, content);
// TODO fix it deserialize_and_validate!(content, model, FooOuter);
// deserialize_and_validate!(content, model, FooOuter);
} }

25
yaserde_derive/src/de/expand_struct.rs
View File

@ -373,16 +373,23 @@ pub fn parse(
); );
match event { match event {
::xml::reader::XmlEvent::StartElement{ref name, ref attributes, ..} => { ::xml::reader::XmlEvent::StartElement{ref name, ref attributes, ..} => {
match name.local_name.as_str() { if depth == 0 && name.local_name == #root {
#call_visitors // Consume root element. We must do this first. In the case it shares a name with a child element, we don't
_ => { // want to prematurely match the child element below.
let event = reader.next_event()?; let event = reader.next_event()?;
#write_unused #write_unused
} else {
match name.local_name.as_str() {
#call_visitors
_ => {
let event = reader.next_event()?;
#write_unused
if depth > 0 { // Don't skip root element if depth > 0 { // Don't skip root element
reader.skip_element(|event| { reader.skip_element(|event| {
#write_unused #write_unused
})?; })?;
}
} }
} }
} }