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

ecaps2, forwarding, jingle_s5b, mam: Replace complex into expressions with .map(Element::from).

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-20 20:52:25 +01:00
parent 487dbdc6de
commit cc563b46d2
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ecaps2.rs
View file

@ -52,8 +52,8 @@ impl From<ECaps2> for Element {
Element::builder("c")
.ns(ns::ECAPS2)
.append(ecaps2.hashes.drain(..)
.map(|hash| hash.into())
.collect::<Vec<Element>>())
.map(Element::from)
.collect::<Vec<_>>())
.build()
}
}

4
src/forwarding.rs
View file

@ -52,8 +52,8 @@ impl From<Forwarded> for Element {
fn from(forwarded: Forwarded) -> Element {
Element::builder("forwarded")
.ns(ns::FORWARD)
.append(match forwarded.delay { Some(delay) => { let elem: Element = delay.into(); Some(elem) }, None => None })
.append(match forwarded.stanza { Some(stanza) => { let elem: Element = stanza.into(); Some(elem) }, None => None })
.append(forwarded.delay.map(Element::from))
.append(forwarded.stanza.map(Element::from))
.build()
}
}

4
src/jingle_s5b.rs
View file

@ -147,8 +147,8 @@ impl From<Transport> for Element {
.append(match transport.payload {
TransportPayload::Candidates(mut candidates) => {
candidates.drain(..)
.map(|candidate| candidate.into())
.collect::<Vec<Element>>()
.map(Element::from)
.collect::<Vec<_>>()
},
TransportPayload::Activated(cid) => {
vec!(Element::builder("activated")

4
src/mam.rs
View file

@ -167,8 +167,8 @@ impl From<Query> for Element {
.ns(ns::MAM)
.attr("queryid", query.queryid)
.attr("node", query.node)
//.append(query.form.map(|form| -> Element { form.into() }))
.append(query.set.map(|set| -> Element { set.into() }))
//.append(query.form.map(Element::from))
.append(query.set.map(Element::from))
.build()
}
}