pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jingle_s5b: Remove the clones.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-24 23:00:38 +01:00
parent 947c49330f
commit 9bd1e7f295
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/jingle_s5b.rs
View file

@ -67,12 +67,12 @@ impl Into<Element> for Candidate {
fn into(self) -> Element { fn into(self) -> Element {
Element::builder("candidate") Element::builder("candidate")
.ns(ns::JINGLE_S5B) .ns(ns::JINGLE_S5B)
.attr("cid", self.cid.clone()) .attr("cid", self.cid)
.attr("host", self.host.clone()) .attr("host", self.host)
.attr("jid", self.jid.clone()) .attr("jid", self.jid)
.attr("port", match self.port { Some(port) => Some(format!("{}", port)), None => None }) .attr("port", match self.port { Some(port) => Some(format!("{}", port)), None => None })
.attr("priority", format!("{}", self.priority)) .attr("priority", format!("{}", self.priority))
.attr("type", self.type_.clone()) .attr("type", self.type_)
.build() .build()
} }
} }
@ -143,22 +143,16 @@ impl TryFrom<Element> for Transport {
payload = Some(if child.is("candidate", ns::JINGLE_S5B) { payload = Some(if child.is("candidate", ns::JINGLE_S5B) {
let mut candidates = match payload { let mut candidates = match payload {
Some(TransportPayload::Candidates(candidates)) => candidates, Some(TransportPayload::Candidates(candidates)) => candidates,
Some(_) => return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element.")), Some(_) => return Err(Error::ParseError("Non-candidate child already present in JingleS5B transport element.")),
None => vec!(), None => vec!(),
}; };
let cid = get_attr!(child, "cid", required);
let host = get_attr!(child, "host", required);
let jid = get_attr!(child, "jid", required);
let port = get_attr!(child, "port", optional);
let priority = get_attr!(child, "priority", required);
let type_ = get_attr!(child, "type", default);
candidates.push(Candidate { candidates.push(Candidate {
cid: cid, cid: get_attr!(child, "cid", required),
host: host, host: get_attr!(child, "host", required),
jid: jid, jid: get_attr!(child, "jid", required),
port: port, port: get_attr!(child, "port", optional),
priority: priority, priority: get_attr!(child, "priority", required),
type_: type_, type_: get_attr!(child, "type", default),
}); });
TransportPayload::Candidates(candidates) TransportPayload::Candidates(candidates)
} else if child.is("activated", ns::JINGLE_S5B) { } else if child.is("activated", ns::JINGLE_S5B) {
@ -204,13 +198,13 @@ impl Into<Element> for Transport {
fn into(self) -> Element { fn into(self) -> Element {
Element::builder("transport") Element::builder("transport")
.ns(ns::JINGLE_S5B) .ns(ns::JINGLE_S5B)
.attr("sid", self.sid.clone()) .attr("sid", self.sid)
.attr("dstaddr", self.dstaddr.clone()) .attr("dstaddr", self.dstaddr)
.attr("mode", self.mode.clone()) .attr("mode", self.mode)
.append(match self.payload { .append(match self.payload {
TransportPayload::Candidates(candidates) => { TransportPayload::Candidates(mut candidates) => {
candidates.iter() candidates.drain(..)
.map(|candidate| -> Element { candidate.clone().into() }) .map(|candidate| candidate.into())
.collect::<Vec<Element>>() .collect::<Vec<Element>>()
}, },
TransportPayload::Activated(cid) => { TransportPayload::Activated(cid) => {