parsers: use Error type from xso
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:
parent
b3e6e089da
commit
6ef8dbefa3
62 changed files with 916 additions and 892 deletions
|
|
@ -7,10 +7,10 @@
|
|||
use crate::date::DateTime;
|
||||
use crate::iq::{IqGetPayload, IqResultPayload};
|
||||
use crate::ns;
|
||||
use crate::util::error::Error;
|
||||
use crate::Element;
|
||||
use chrono::FixedOffset;
|
||||
use std::str::FromStr;
|
||||
use xso::error::{Error, FromElementError};
|
||||
|
||||
generate_empty_element!(
|
||||
/// An entity time query.
|
||||
|
|
@ -28,9 +28,9 @@ pub struct TimeResult(pub DateTime);
|
|||
impl IqResultPayload for TimeResult {}
|
||||
|
||||
impl TryFrom<Element> for TimeResult {
|
||||
type Error = Error;
|
||||
type Error = FromElementError;
|
||||
|
||||
fn try_from(elem: Element) -> Result<TimeResult, Error> {
|
||||
fn try_from(elem: Element) -> Result<TimeResult, FromElementError> {
|
||||
check_self!(elem, "time", TIME);
|
||||
check_no_attributes!(elem, "time");
|
||||
|
||||
|
|
@ -40,33 +40,34 @@ impl TryFrom<Element> for TimeResult {
|
|||
for child in elem.children() {
|
||||
if child.is("tzo", ns::TIME) {
|
||||
if tzo.is_some() {
|
||||
return Err(Error::ParseError("More than one tzo element in time."));
|
||||
return Err(Error::Other("More than one tzo element in time.").into());
|
||||
}
|
||||
check_no_children!(child, "tzo");
|
||||
check_no_attributes!(child, "tzo");
|
||||
// TODO: Add a FromStr implementation to FixedOffset to avoid this hack.
|
||||
let fake_date = format!("{}{}", "2019-04-22T11:38:00", child.text());
|
||||
let date_time = DateTime::from_str(&fake_date)?;
|
||||
let date_time = DateTime::from_str(&fake_date).map_err(Error::text_parse_error)?;
|
||||
tzo = Some(date_time.timezone());
|
||||
} else if child.is("utc", ns::TIME) {
|
||||
if utc.is_some() {
|
||||
return Err(Error::ParseError("More than one utc element in time."));
|
||||
return Err(Error::Other("More than one utc element in time.").into());
|
||||
}
|
||||
check_no_children!(child, "utc");
|
||||
check_no_attributes!(child, "utc");
|
||||
let date_time = DateTime::from_str(&child.text())?;
|
||||
let date_time =
|
||||
DateTime::from_str(&child.text()).map_err(Error::text_parse_error)?;
|
||||
match FixedOffset::east_opt(0) {
|
||||
Some(tz) if date_time.timezone() == tz => (),
|
||||
_ => return Err(Error::ParseError("Non-UTC timezone for utc element.")),
|
||||
_ => return Err(Error::Other("Non-UTC timezone for utc element.").into()),
|
||||
}
|
||||
utc = Some(date_time);
|
||||
} else {
|
||||
return Err(Error::ParseError("Unknown child in time element."));
|
||||
return Err(Error::Other("Unknown child in time element.").into());
|
||||
}
|
||||
}
|
||||
|
||||
let tzo = tzo.ok_or(Error::ParseError("Missing tzo child in time element."))?;
|
||||
let utc = utc.ok_or(Error::ParseError("Missing utc child in time element."))?;
|
||||
let tzo = tzo.ok_or(Error::Other("Missing tzo child in time element."))?;
|
||||
let utc = utc.ok_or(Error::Other("Missing utc child in time element."))?;
|
||||
let date = utc.with_timezone(tzo);
|
||||
|
||||
Ok(TimeResult(date))
|
||||
|
|
|
|||
Loading…
Reference in a new issue