Use better iter() semantics to collect cfg flags.

jhbabon · jhbabon · commit fd8274a42407 · 2016-10-31T23:54:04.000+01:00
diff --git 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)));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,9 @@ pub fn compile_targets<'a, 'cfg: 'a>(ws: &Workspace<'cfg>,`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if let Some(feats) = cx.resolve.features(&unit.pkg.package_id()) {`
`146`		`- for feat in feats.iter() {`
`147`		`- cx.compilation.cfgs.entry(unit.pkg.package_id().clone())`
`148`		`- .or_insert(HashSet::new())`
`149`		`- .insert(format!("feature=\"{}\"", feat));`
`150`		`- }`
	`146`	`+ cx.compilation.cfgs.entry(unit.pkg.package_id().clone())`
	`147`	`+ .or_insert(HashSet::new())`
	`148`	`+ .extend(feats.iter().map(\|feat\| format!("feature=\"{}\"", feat)));`
`151`	`149`	`}`
`152`	`150`	`}`
`153`	`151`