nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 01:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

xml: Support CDATA

Browse Source
This commit is contained in:
Lennart
2025-02-05 17:56:52 +01:00
parent 0596fe6396
commit 89f2483dac
4 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/xml/derive/src/xml_struct.rs
View File

@@ -111,7 +111,8 @@ impl NamedStruct {
if untagged_field_branches.len() > 1 {
panic!("Currently only one untagged field supported!");
}
let text_field_branches = self.fields.iter().filter_map(Field::text_branch);
let text_field_branches: Vec<_> =
self.fields.iter().filter_map(Field::text_branch).collect();
let attr_field_branches = self.fields.iter().filter_map(Field::attr_branch);
let tagname_field_branches = self.fields.iter().filter_map(Field::tagname_branch);
@@ -175,7 +176,8 @@ impl NamedStruct {
#(#text_field_branches)*
}
Event::CData(cdata) => {
return Err(XmlError::UnsupportedEvent("CDATA"));
let text = String::from_utf8(cdata.to_vec())?;
#(#text_field_branches)*
}
Event::Comment(_) => { /* ignore */ }
Event::Decl(_) => {
@@ -191,7 +193,7 @@ impl NamedStruct {
return Err(XmlError::UnsupportedEvent("Doctype in the middle of the document"));
}
Event::End(end) => {
// Error: premature end
// This should actually be unreachable
return Err(XmlError::Other("Unexpected closing tag for wrong element".to_owned()));
}
}