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

Convert all of the parsers/serialisers into consuming their parameter.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-23 23:31:33 +01:00
commit 16e43c0b01
26 changed files with 378 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ping.rs
View file

@ -16,10 +16,10 @@ use ns;
#[derive(Debug, Clone)]
pub struct Ping;
impl<'a> TryFrom<&'a Element> for Ping {
impl TryFrom<Element> for Ping {
type Error = Error;
fn try_from(elem: &'a Element) -> Result<Ping, Error> {
fn try_from(elem: Element) -> Result<Ping, Error> {
if !elem.is("ping", ns::PING) {
return Err(Error::ParseError("This is not a ping element."));
}
@ -33,7 +33,7 @@ impl<'a> TryFrom<&'a Element> for Ping {
}
}
impl<'a> Into<Element> for &'a Ping {
impl Into<Element> for Ping {
fn into(self) -> Element {
Element::builder("ping")
.ns(ns::PING)
@ -48,13 +48,13 @@ mod tests {
#[test]
fn test_simple() {
let elem: Element = "<ping xmlns='urn:xmpp:ping'/>".parse().unwrap();
Ping::try_from(&elem).unwrap();
Ping::try_from(elem).unwrap();
}
#[test]
fn test_invalid() {
let elem: Element = "<ping xmlns='urn:xmpp:ping'><coucou/></ping>".parse().unwrap();
let error = Ping::try_from(&elem).unwrap_err();
let error = Ping::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),
@ -65,7 +65,7 @@ mod tests {
#[test]
fn test_invalid_attribute() {
let elem: Element = "<ping xmlns='urn:xmpp:ping' coucou=''/>".parse().unwrap();
let error = Ping::try_from(&elem).unwrap_err();
let error = Ping::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),