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

20
parsers/src/sasl.rs
View file

@ -5,10 +5,10 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
use crate::ns;
use crate::util::error::Error;
use crate::util::text_node_codecs::{Base64, Codec};
use crate::Element;
use std::collections::BTreeMap;
use xso::error::{Error, FromElementError};
generate_attribute!(
/// The list of available SASL mechanisms.
@ -150,9 +150,9 @@ pub struct Failure {
}
impl TryFrom<Element> for Failure {
type Error = Error;
type Error = FromElementError;
fn try_from(root: Element) -> Result<Failure, Error> {
fn try_from(root: Element) -> Result<Failure, FromElementError> {
check_self!(root, "failure", SASL);
check_no_attributes!(root, "failure");
@ -165,15 +165,17 @@ impl TryFrom<Element> for Failure {
check_no_children!(child, "text");
let lang = get_attr!(child, "xml:lang", Default);
if texts.insert(lang, child.text()).is_some() {
return Err(Error::ParseError(
return Err(Error::Other(
"Text element present twice for the same xml:lang in failure element.",
));
)
.into());
}
} else if child.has_ns(ns::SASL) {
if defined_condition.is_some() {
return Err(Error::ParseError(
return Err(Error::Other(
"Failure must not have more than one defined-condition.",
));
)
.into());
}
check_no_attributes!(child, "defined-condition");
check_no_children!(child, "defined-condition");
@ -184,11 +186,11 @@ impl TryFrom<Element> for Failure {
};
defined_condition = Some(condition);
} else {
return Err(Error::ParseError("Unknown element in Failure."));
return Err(Error::Other("Unknown element in Failure.").into());
}
}
let defined_condition =
defined_condition.ok_or(Error::ParseError("Failure must have a defined-condition."))?;
defined_condition.ok_or(Error::Other("Failure must have a defined-condition."))?;
Ok(Failure {
defined_condition,