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

ecaps2: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:58:22 +01:00
commit f963715e77
2 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/presence.rs
View file

@ -18,7 +18,7 @@ use ns;
use stanza_error;
use delay::Delay;
use ecaps2;
use ecaps2::ECaps2;
#[derive(Debug, Clone, PartialEq)]
pub enum Show {
@ -53,7 +53,7 @@ pub enum PresencePayload {
Priority(Priority),
StanzaError(stanza_error::StanzaError),
Delay(Delay),
ECaps2(ecaps2::ECaps2),
ECaps2(ECaps2),
}
#[derive(Debug, Clone, PartialEq)]
@ -183,7 +183,7 @@ pub fn parse_presence(root: &Element) -> Result<Presence, Error> {
Some(PresencePayload::StanzaError(stanza_error))
} else if let Ok(delay) = Delay::try_from(elem) {
Some(PresencePayload::Delay(delay))
} else if let Ok(ecaps2) = ecaps2::parse_ecaps2(elem) {
} else if let Ok(ecaps2) = ECaps2::try_from(elem) {
Some(PresencePayload::ECaps2(ecaps2))
} else {
None
@ -228,7 +228,7 @@ pub fn serialise_payload(payload: &PresencePayload) -> Element {
},
PresencePayload::StanzaError(ref stanza_error) => stanza_error::serialise(stanza_error),
PresencePayload::Delay(ref delay) => delay.into(),
PresencePayload::ECaps2(ref ecaps2) => ecaps2::serialise(ecaps2),
PresencePayload::ECaps2(ref ecaps2) => ecaps2.into(),
}
}