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
|
|
@ -4,7 +4,6 @@
|
|||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
use crate::util::error::Error;
|
||||
use chrono::{DateTime as ChronoDateTime, FixedOffset};
|
||||
use minidom::{IntoAttributeValue, Node};
|
||||
use std::str::FromStr;
|
||||
|
|
@ -33,9 +32,9 @@ impl DateTime {
|
|||
}
|
||||
|
||||
impl FromStr for DateTime {
|
||||
type Err = Error;
|
||||
type Err = chrono::ParseError;
|
||||
|
||||
fn from_str(s: &str) -> Result<DateTime, Error> {
|
||||
fn from_str(s: &str) -> Result<DateTime, Self::Err> {
|
||||
Ok(DateTime(ChronoDateTime::parse_from_rfc3339(s)?))
|
||||
}
|
||||
}
|
||||
|
|
@ -80,51 +79,27 @@ mod tests {
|
|||
fn test_invalid_date() {
|
||||
// There is no thirteenth month.
|
||||
let error = DateTime::from_str("2017-13-01T12:23:34Z").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "input is out of range");
|
||||
assert_eq!(error.to_string(), "input is out of range");
|
||||
|
||||
// Timezone ≥24:00 aren’t allowed.
|
||||
let error = DateTime::from_str("2017-05-27T12:11:02+25:00").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "input is out of range");
|
||||
assert_eq!(error.to_string(), "input is out of range");
|
||||
|
||||
// Timezone without the : separator aren’t allowed.
|
||||
let error = DateTime::from_str("2017-05-27T12:11:02+0100").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "input contains invalid characters");
|
||||
assert_eq!(error.to_string(), "input contains invalid characters");
|
||||
|
||||
// No seconds, error message could be improved.
|
||||
let error = DateTime::from_str("2017-05-27T12:11+01:00").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "input contains invalid characters");
|
||||
assert_eq!(error.to_string(), "input contains invalid characters");
|
||||
|
||||
// TODO: maybe we’ll want to support this one, as per XEP-0082 §4.
|
||||
let error = DateTime::from_str("20170527T12:11:02+01:00").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "input contains invalid characters");
|
||||
assert_eq!(error.to_string(), "input contains invalid characters");
|
||||
|
||||
// No timezone.
|
||||
let error = DateTime::from_str("2017-05-27T12:11:02").unwrap_err();
|
||||
let message = match error {
|
||||
Error::ChronoParseError(string) => string,
|
||||
_ => panic!(),
|
||||
};
|
||||
assert_eq!(message.to_string(), "premature end of input");
|
||||
assert_eq!(error.to_string(), "premature end of input");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Reference in a new issue