ecaps2, jingle_s5b: Replace drain() with into_iter().

Emmanuel Gil Peyrot created 8 years ago

Change summary

src/ecaps2.rs     | 4 ++--
src/jingle_s5b.rs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

src/ecaps2.rs

@@ -49,10 +49,10 @@ impl TryFrom<Element> for ECaps2 {
 }
 
 impl From<ECaps2> for Element {
-    fn from(mut ecaps2: ECaps2) -> Element {
+    fn from(ecaps2: ECaps2) -> Element {
         Element::builder("c")
                 .ns(ns::ECAPS2)
-                .append(ecaps2.hashes.drain(..)
+                .append(ecaps2.hashes.into_iter()
                                      .map(Element::from)
                                      .collect::<Vec<_>>())
                 .build()

src/jingle_s5b.rs

@@ -145,8 +145,8 @@ impl From<Transport> for Element {
                 .attr("dstaddr", transport.dstaddr)
                 .attr("mode", transport.mode)
                 .append(match transport.payload {
-                     TransportPayload::Candidates(mut candidates) => {
-                         candidates.drain(..)
+                     TransportPayload::Candidates(candidates) => {
+                         candidates.into_iter()
                                    .map(Element::from)
                                    .collect::<Vec<_>>()
                      },
@@ -161,7 +161,7 @@ impl From<Transport> for Element {
                                       .ns(ns::JINGLE_S5B)
                                       .build())
                      },
-                     TransportPayload::CandidateUsed(ref cid) => {
+                     TransportPayload::CandidateUsed(cid) => {
                          vec!(Element::builder("candidate-used")
                                       .ns(ns::JINGLE_S5B)
                                       .attr("cid", cid)