Leahnaya/kbinxml-rs
1
0
Fork 0
mirror of https://github.com/mbilker/kbinxml-rs.git synced 2026-09-09 11:05:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

node(extra): hoist Nodes inside Value out of Value

Browse Source
This commit is contained in:
Matt Bilker
2018-09-03 00:21:14 -04:00
parent 5c53542e1f
commit f011a4ffc0
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/node/extra/de.rs
View File

@@ -29,15 +29,7 @@ impl<'de> Deserialize<'de> for ExtraNodes {
let mut extra = ExtraNodes::new();
loop {
let key = match map.next_key::<String>() {
Ok(Some(s)) => s,
Ok(None) => break,
Err(e) => {
error!("ExtraNodesVisitor::visit_map() => error: {:?}", e);
return Err(e);
},
};
while let Some(key) = try!(map.next_key::<String>()) {
debug!("ExtraNodesVisitor::visit_map() => key: {:?}", key);
let marshal: Marshal = try!(map.next_value());
@@ -59,16 +51,18 @@ impl<'de> Deserialize<'de> for ExtraNodes {
return Err(A::Error::custom("`Marshal` must contain `Value` for attribute"));
}
} else {
/*
let node = NodeVisitor::map_to_node(node_type, &key, &mut map)?;
debug!("ExtraNodesVisitor::visit_map() => node: {:?}", node);
*/
match value {
MarshalValue::Value(value) => extra.insert(key.clone(), Node::with_value(key, value)),
MarshalValue::Node(mut node) => {
node.key = key.clone();
extra.insert(key, node)
},
MarshalValue::Value(value) => match value {
Value::Node(mut node) => {
node.key = key.clone();
extra.insert(key, *node)
},
value => extra.insert(key.clone(), Node::with_value(key, value)),
},
};
}
}