From: Juan Hernández <juan.hernandez.babon@gmail.com>
Date: Mon, 31 Oct 2016 22:54:04 +0000 (+0100)
Subject: Use better iter() semantics to collect cfg flags.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~23^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd8274a42407b6f1dc41674a0a9c51c7d6f6cdfe;p=cargo.git

Use better iter() semantics to collect cfg flags.
---

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 26edaae9e..00bcb8662 100644
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -143,11 +143,9 @@ pub fn compile_targets<'a, 'cfg: 'a>(ws: &Workspace<'cfg>,
         }
 
         if let Some(feats) = cx.resolve.features(&unit.pkg.package_id()) {
-            for feat in feats.iter() {
-                cx.compilation.cfgs.entry(unit.pkg.package_id().clone())
-                    .or_insert(HashSet::new())
-                    .insert(format!("feature=\"{}\"", feat));
-            }
+            cx.compilation.cfgs.entry(unit.pkg.package_id().clone())
+                .or_insert(HashSet::new())
+                .extend(feats.iter().map(|feat| format!("feature=\"{}\"", feat)));
         }
     }