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

Emmanuel Gil Peyrot created 8 years ago

Change summary

src/ecaps2.rs     | 4 ++--
src/forwarding.rs | 4 ++--
src/jingle_s5b.rs | 4 ++--
src/mam.rs        | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)

Detailed changes

src/ecaps2.rs

@@ -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()
     }
 }

src/forwarding.rs

@@ -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()
     }
 }

src/jingle_s5b.rs

@@ -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")

src/mam.rs

@@ -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()
     }
 }