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

ibb: Port to TryFrom/Into.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-04 23:11:10 +01:00
commit e3acb55b49
2 changed files with 86 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/iq.rs
View file

@ -18,7 +18,7 @@ use ns;
use stanza_error;
use disco;
use ibb;
use ibb::IBB;
use jingle::Jingle;
use ping::Ping;
@ -26,7 +26,7 @@ use ping::Ping;
#[derive(Debug, Clone)]
pub enum IqPayload {
Disco(disco::Disco),
IBB(ibb::IBB),
IBB(IBB),
Jingle(Jingle),
Ping(Ping),
}
@ -97,7 +97,7 @@ pub fn parse_iq(root: &Element) -> Result<Iq, Error> {
} else {
let parsed_payload = if let Ok(disco) = disco::parse_disco(elem) {
Some(IqPayload::Disco(disco))
} else if let Ok(ibb) = ibb::parse_ibb(elem) {
} else if let Ok(ibb) = IBB::try_from(elem) {
Some(IqPayload::IBB(ibb))
} else if let Ok(jingle) = Jingle::try_from(elem) {
Some(IqPayload::Jingle(jingle))
@ -153,7 +153,7 @@ pub fn parse_iq(root: &Element) -> Result<Iq, Error> {
pub fn serialise_payload(payload: &IqPayload) -> Element {
match *payload {
IqPayload::Disco(ref disco) => disco::serialise_disco(disco),
IqPayload::IBB(ref ibb) => ibb::serialise(ibb),
IqPayload::IBB(ref ibb) => ibb.into(),
IqPayload::Jingle(ref jingle) => jingle.into(),
IqPayload::Ping(ref ping) => ping.into(),
}