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

xml: Rename XmlDeError to XmlError

Browse Source
This commit is contained in:
Lennart
2025-01-15 18:15:04 +01:00
parent 95f7912947
commit d74f0ba660
14 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ fn invalid_field_branch(ident: &syn::Ident, allow: bool) -> proc_macro2::TokenSt
quote! {}
} else {
quote! {
return Err(XmlDeError::InvalidFieldName(#ident, format!("[{ns:?}]{tag}", tag = String::from_utf8_lossy(tag)))) }
return Err(XmlError::InvalidFieldName(#ident, format!("[{ns:?}]{tag}", tag = String::from_utf8_lossy(tag)))) }
}
}
@@ -130,9 +130,9 @@ impl NamedStruct {
reader: &mut quick_xml::NsReader<R>,
start: &quick_xml::events::BytesStart,
empty: bool
) -> Result<Self, rustical_xml::XmlDeError> {
) -> Result<Self, rustical_xml::XmlError> {
use quick_xml::events::Event;
use rustical_xml::XmlDeError;
use rustical_xml::XmlError;
let mut buf = Vec::new();
@@ -163,7 +163,7 @@ impl NamedStruct {
Event::End(e) if e.name() == start.name() => {
break;
}
Event::Eof => return Err(XmlDeError::Eof),
Event::Eof => return Err(XmlError::Eof),
// start of a child element
Event::Start(start) | Event::Empty(start) => {
let empty = matches!(event, Event::Empty(_));
@@ -179,24 +179,24 @@ impl NamedStruct {
#(#text_field_branches)*
}
Event::CData(cdata) => {
return Err(XmlDeError::UnsupportedEvent("CDATA"));
return Err(XmlError::UnsupportedEvent("CDATA"));
}
Event::Comment(_) => { /* ignore */ }
Event::Decl(_) => {
// Error: not supported
return Err(XmlDeError::UnsupportedEvent("Declaration"));
return Err(XmlError::UnsupportedEvent("Declaration"));
}
Event::PI(_) => {
// Error: not supported
return Err(XmlDeError::UnsupportedEvent("Processing instruction"));
return Err(XmlError::UnsupportedEvent("Processing instruction"));
}
Event::DocType(doctype) => {
// Error: start of new document
return Err(XmlDeError::UnsupportedEvent("Doctype in the middle of the document"));
return Err(XmlError::UnsupportedEvent("Doctype in the middle of the document"));
}
Event::End(end) => {
// Error: premature end
return Err(XmlDeError::Other("Unexpected closing tag for wrong element".to_owned()));
return Err(XmlError::Other("Unexpected closing tag for wrong element".to_owned()));
}
}
}