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

Replace Into<Element> with From<…> for Element.

Browse source 
This allows Element::from() to work, and since Into<Element> is
automatically implemented for any type implementing From there is no
change to existing code.
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-20 20:36:13 +01:00
commit 487dbdc6de
28 changed files with 266 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/jingle_s5b.rs
View file

@ -40,16 +40,16 @@ pub struct Candidate {
pub type_: Type,
}
impl Into<Element> for Candidate {
fn into(self) -> Element {
impl From<Candidate> for Element {
fn from(candidate: Candidate) -> Element {
Element::builder("candidate")
.ns(ns::JINGLE_S5B)
.attr("cid", self.cid)
.attr("host", self.host)
.attr("jid", String::from(self.jid))
.attr("port", self.port)
.attr("priority", self.priority)
.attr("type", self.type_)
.attr("cid", candidate.cid)
.attr("host", candidate.host)
.attr("jid", String::from(candidate.jid))
.attr("port", candidate.port)
.attr("priority", candidate.priority)
.attr("type", candidate.type_)
.build()
}
}
@ -137,14 +137,14 @@ impl TryFrom<Element> for Transport {
}
}
impl Into<Element> for Transport {
fn into(self) -> Element {
impl From<Transport> for Element {
fn from(transport: Transport) -> Element {
Element::builder("transport")
.ns(ns::JINGLE_S5B)
.attr("sid", self.sid)
.attr("dstaddr", self.dstaddr)
.attr("mode", self.mode)
.append(match self.payload {
.attr("sid", transport.sid)
.attr("dstaddr", transport.dstaddr)
.attr("mode", transport.mode)
.append(match transport.payload {
TransportPayload::Candidates(mut candidates) => {
candidates.drain(..)
.map(|candidate| candidate.into())