nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 04:42:15 +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

16
crates/xml/src/de.rs
View File

@@ -4,7 +4,7 @@ use std::io::BufRead;
pub use xml_derive::XmlDeserialize;
pub use xml_derive::XmlDocument;
use crate::XmlDeError;
use crate::XmlError;
use crate::XmlRootTag;
pub trait XmlDeserialize: Sized {
@@ -12,14 +12,14 @@ pub trait XmlDeserialize: Sized {
reader: &mut quick_xml::NsReader<R>,
start: &BytesStart,
empty: bool,
) -> Result<Self, XmlDeError>;
) -> Result<Self, XmlError>;
}
pub trait XmlDocument: XmlDeserialize {
fn parse<R: BufRead>(reader: quick_xml::NsReader<R>) -> Result<Self, XmlDeError>;
fn parse<R: BufRead>(reader: quick_xml::NsReader<R>) -> Result<Self, XmlError>;
#[inline]
fn parse_reader<R: BufRead>(input: R) -> Result<Self, XmlDeError>
fn parse_reader<R: BufRead>(input: R) -> Result<Self, XmlError>
where
Self: XmlDeserialize,
{
@@ -29,13 +29,13 @@ pub trait XmlDocument: XmlDeserialize {
}
#[inline]
fn parse_str(s: &str) -> Result<Self, XmlDeError> {
fn parse_str(s: &str) -> Result<Self, XmlError> {
Self::parse_reader(s.as_bytes())
}
}
impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
fn parse<R: BufRead>(mut reader: quick_xml::NsReader<R>) -> Result<Self, XmlDeError>
fn parse<R: BufRead>(mut reader: quick_xml::NsReader<R>) -> Result<Self, XmlError>
where
Self: XmlDeserialize,
{
@@ -57,7 +57,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
};
if !matches {
let root_ns = Self::root_ns();
return Err(XmlDeError::InvalidTag(
return Err(XmlError::InvalidTag(
format!("{ns:?}"),
String::from_utf8_lossy(name.as_ref()).to_string(),
format!("{root_ns:?}"),
@@ -67,7 +67,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
return Self::deserialize(&mut reader, &start, empty);
}
_ => return Err(XmlDeError::UnsupportedEvent("unknown, todo")),
_ => return Err(XmlError::UnsupportedEvent("unknown, todo")),
};
}
}

2
crates/xml/src/error.rs
View File

@@ -1,7 +1,7 @@
use thiserror::Error;
#[derive(Debug, Error)]
pub enum XmlDeError {
pub enum XmlError {
#[error(transparent)]
QuickXmlError(#[from] quick_xml::Error),
#[error(transparent)]

8
crates/xml/src/lib.rs
View File

@@ -10,7 +10,7 @@ mod value;
pub use de::XmlDeserialize;
pub use de::XmlDocument;
pub use error::XmlDeError;
pub use error::XmlError;
pub use se::XmlSerialize;
pub use se::XmlSerializeRoot;
pub use value::{ParseValueError, ValueDeserialize, ValueSerialize};
@@ -21,7 +21,7 @@ impl XmlDeserialize for () {
reader: &mut quick_xml::NsReader<R>,
start: &BytesStart,
empty: bool,
) -> Result<Self, XmlDeError> {
) -> Result<Self, XmlError> {
if empty {
return Ok(());
}
@@ -29,7 +29,7 @@ impl XmlDeserialize for () {
loop {
match reader.read_event_into(&mut buf)? {
Event::End(e) if e.name() == start.name() => return Ok(()),
Event::Eof => return Err(XmlDeError::Eof),
Event::Eof => return Err(XmlError::Eof),
_ => {}
};
}
@@ -91,7 +91,7 @@ impl XmlDeserialize for Unparsed {
reader: &mut quick_xml::NsReader<R>,
start: &BytesStart,
empty: bool,
) -> Result<Self, XmlDeError> {
) -> Result<Self, XmlError> {
// let reader_cloned = NsReader::from_reader(reader.get_ref().to_owned());
if !empty {
let mut buf = vec![];

16
crates/xml/src/value.rs
View File

@@ -5,7 +5,7 @@ use std::num::{ParseFloatError, ParseIntError};
use std::{convert::Infallible, io::BufRead};
use thiserror::Error;
use crate::{XmlDeError, XmlDeserialize, XmlSerialize};
use crate::{XmlError, XmlDeserialize, XmlSerialize};
#[derive(Debug, Error)]
pub enum ParseValueError {
@@ -22,7 +22,7 @@ pub trait ValueSerialize: Sized {
}
pub trait ValueDeserialize: Sized {
fn deserialize(val: &str) -> Result<Self, XmlDeError>;
fn deserialize(val: &str) -> Result<Self, XmlError>;
}
macro_rules! impl_value_parse {
@@ -34,10 +34,10 @@ macro_rules! impl_value_parse {
}
impl ValueDeserialize for $t {
fn deserialize(val: &str) -> Result<Self, XmlDeError> {
fn deserialize(val: &str) -> Result<Self, XmlError> {
val.parse()
.map_err(ParseValueError::from)
.map_err(XmlDeError::from)
.map_err(XmlError::from)
}
}
};
@@ -68,7 +68,7 @@ impl<T: ValueDeserialize> XmlDeserialize for T {
reader: &mut quick_xml::NsReader<R>,
_start: &BytesStart,
empty: bool,
) -> Result<Self, XmlDeError> {
) -> Result<Self, XmlError> {
let mut string = String::new();
if !empty {
@@ -78,13 +78,13 @@ impl<T: ValueDeserialize> XmlDeserialize for T {
Event::Text(text) => {
if !string.is_empty() {
// Content already written
return Err(XmlDeError::UnsupportedEvent("content already written"));
return Err(XmlError::UnsupportedEvent("content already written"));
}
string = String::from_utf8_lossy(text.as_ref()).to_string();
}
Event::End(_) => break,
Event::Eof => return Err(XmlDeError::Eof),
_ => return Err(XmlDeError::UnsupportedEvent("todo")),
Event::Eof => return Err(XmlError::Eof),
_ => return Err(XmlError::UnsupportedEvent("todo")),
};
}
}