xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

parsers: use Error type from xso

Browse source 
This is a large change and as such, it needs good motivation. Let me
remind you of the ultimate goal: we want a derive macro which allows us
to FromXml/IntoXml, and that derive macro should be usable from
`xmpp_parsers` and other crates.

For that, any code generated by the derive macro mustn't depend on any
code in the `xmpp_parsers` crate, because you cannot name the crate you
are in portably (`xmpp_parsers::..` wouldn't resolve within
`xmpp_parsers`, and `crate::..` would point at other crates if the macro
was used in other crates).

We also want to interoperate with code already implementing
`TryFrom<Element>` and `Into<Element>` on structs. This ultimately
requires that we have an error type which is shared by the two
implementations and that error type must be declared in the `xso` crate
to be usable by the macros.

Thus, we port the error type over to use the type declared in `xso`.

This changes the structure of the error type greatly; I do not think
that `xso` should have to know about all the different types we are
parsing there and they don't deserve special treatment. Wrapping them in
a `Box<dyn ..>` seems more appropriate.
This commit is contained in:
Jonas Schäfer 2024-06-21 16:27:43 +02:00
commit 6ef8dbefa3
62 changed files with 916 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

15
parsers/src/xhtml.rs
View file

@ -6,9 +6,9 @@
use crate::message::MessagePayload;
use crate::ns;
use crate::util::error::Error;
use minidom::{Element, Node};
use std::collections::HashMap;
use xso::error::{Error, FromElementError};
// TODO: Use a proper lang type.
type Lang = String;
@ -60,9 +60,9 @@ impl XhtmlIm {
impl MessagePayload for XhtmlIm {}
impl TryFrom<Element> for XhtmlIm {
type Error = Error;
type Error = FromElementError;
fn try_from(elem: Element) -> Result<XhtmlIm, Error> {
fn try_from(elem: Element) -> Result<XhtmlIm, FromElementError> {
check_self!(elem, "html", XHTML_IM);
check_no_attributes!(elem, "html");
@ -75,13 +75,14 @@ impl TryFrom<Element> for XhtmlIm {
match bodies.insert(lang, body) {
None => (),
Some(_) => {
return Err(Error::ParseError(
return Err(Error::Other(
"Two identical language bodies found in XHTML-IM.",
))
)
.into())
}
}
} else {
return Err(Error::ParseError("Unknown element in XHTML-IM."));
return Err(Error::Other("Unknown element in XHTML-IM.").into());
}
}
@ -544,7 +545,7 @@ mod tests {
.unwrap();
let error = XhtmlIm::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
FromElementError::Invalid(Error::Other(string)) => string,
_ => panic!(),
};
assert_eq!(message, "Two identical language bodies found in XHTML-IM.");