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

ping: Port to TryFrom/Into.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-04 01:31:13 +01:00
commit 033cbe777b
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/iq.rs
View file

@ -20,7 +20,7 @@ use stanza_error;
use disco;
use ibb;
use jingle::Jingle;
use ping;
use ping::Ping;
/// Lists every known payload of a `<iq/>`.
#[derive(Debug, Clone)]
@ -28,7 +28,7 @@ pub enum IqPayload {
Disco(disco::Disco),
IBB(ibb::IBB),
Jingle(Jingle),
Ping(ping::Ping),
Ping(Ping),
}
#[derive(Debug, Clone)]
@ -101,7 +101,7 @@ pub fn parse_iq(root: &Element) -> Result<Iq, Error> {
Some(IqPayload::IBB(ibb))
} else if let Ok(jingle) = Jingle::try_from(elem) {
Some(IqPayload::Jingle(jingle))
} else if let Ok(ping) = ping::parse_ping(elem) {
} else if let Ok(ping) = Ping::try_from(elem) {
Some(IqPayload::Ping(ping))
} else {
None
@ -155,7 +155,7 @@ pub fn serialise_payload(payload: &IqPayload) -> Element {
IqPayload::Disco(ref disco) => disco::serialise_disco(disco),
IqPayload::IBB(ref ibb) => ibb::serialise(ibb),
IqPayload::Jingle(ref jingle) => jingle.into(),
IqPayload::Ping(_) => ping::serialise_ping(),
IqPayload::Ping(ref ping) => ping.into(),
}
}