instant-labs
/
instant-xml
mirror of https://github.com/instant-labs/instant-xml.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename TagData fields

This commit is contained in:
Dirkjan Ochtman 2022-09-04 13:57:52 +02:00
parent 1b974010fb
commit 40b47aed37
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
instant-xml/src/de.rs
View File

@ -92,7 +92,7 @@ impl<'xml> Deserializer<'xml> {
let parser_default_namespace_to_revert = self.parser_default_namespace; let parser_default_namespace_to_revert = self.parser_default_namespace;
// Set parser default namespace // Set parser default namespace
match tag_data.default_namespace { match tag_data.ns {
Some(namespace) => { Some(namespace) => {
self.parser_default_namespace = namespace; self.parser_default_namespace = namespace;
} }
@ -111,7 +111,7 @@ impl<'xml> Deserializer<'xml> {
// Adding parser namespaces // Adding parser namespaces
let new_parser_namespaces = tag_data let new_parser_namespaces = tag_data
.namespaces .prefixes
.iter() .iter()
.filter(|(k, v)| self.parser_namespaces.insert(k, v).is_none()) .filter(|(k, v)| self.parser_namespaces.insert(k, v).is_none())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -179,7 +179,7 @@ impl<'xml> Deserializer<'xml> {
_ => return Err(Error::UnexpectedValue), _ => return Err(Error::UnexpectedValue),
}; };
if tag_data.default_namespace != self.consume_next_def_namespace() { if tag_data.ns != self.consume_next_def_namespace() {
return Err(Error::WrongNamespace); return Err(Error::WrongNamespace);
} }
@ -245,8 +245,8 @@ impl<'a> XmlParser<'a> {
Ok(Some(XmlRecord::Open(TagData { Ok(Some(XmlRecord::Open(TagData {
key: local.as_str(), key: local.as_str(),
attributes: Vec::new(), attributes: Vec::new(),
default_namespace: Some(""), ns: Some(""),
namespaces: HashMap::new(), prefixes: HashMap::new(),
prefix, prefix,
}))) })))
} }
@ -298,8 +298,8 @@ impl<'xml> Iterator for XmlParser<'xml> {
return Some(Ok(XmlRecord::Open(TagData { return Some(Ok(XmlRecord::Open(TagData {
key: key.unwrap(), key: key.unwrap(),
attributes, attributes,
default_namespace, ns: default_namespace,
namespaces, prefixes: namespaces,
prefix: prefix_ret, prefix: prefix_ret,
}))); })));
} }
@ -364,8 +364,8 @@ pub enum XmlRecord<'xml> {
pub struct TagData<'xml> { pub struct TagData<'xml> {
pub key: &'xml str, pub key: &'xml str,
pub attributes: Vec<(&'xml str, &'xml str)>, pub attributes: Vec<(&'xml str, &'xml str)>,
pub default_namespace: Option<&'xml str>, pub ns: Option<&'xml str>,
pub namespaces: HashMap<&'xml str, &'xml str>, pub prefixes: HashMap<&'xml str, &'xml str>,
pub prefix: Option<&'xml str>, pub prefix: Option<&'xml str>,
} }