Skip to content

Commit f490f16

Browse files
committed
use iterator combinators rather than for loops
1 parent d6d4e71 commit f490f16

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/cargo/ops/cargo_compile.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
236236
and the workspace has no members.", ws.current_manifest().display()).into());
237237
};
238238

239-
let mut to_builds = Vec::new();
240-
for p in specs.iter() {
241-
let p = packages.get(p.query(resolve_with_overrides.iter())?)?;
239+
let to_builds = specs.iter().map(|p| {
240+
let pkgid = p.query(resolve_with_overrides.iter())?;
241+
let p = packages.get(pkgid)?;
242242
p.manifest().print_teapot(ws.config());
243-
to_builds.push(p);
244-
}
243+
Ok(p)
244+
}).collect::<CargoResult<Vec<_>>>()?;
245245

246246
let mut general_targets = Vec::new();
247247
let mut package_targets = Vec::new();

src/cargo/ops/cargo_doc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ pub fn doc(ws: &Workspace, options: &DocOptions) -> CargoResult<()> {
2727
and the workspace has no members.", ws.current_manifest().display()).into());
2828
};
2929

30-
let mut pkgs = Vec::new();
31-
for p in specs.iter() {
32-
pkgs.push(packages.get(p.query(resolve_with_overrides.iter())?)?);
33-
}
30+
let pkgs = specs.iter().map(|p| {
31+
let pkgid = p.query(resolve_with_overrides.iter())?;
32+
packages.get(pkgid)
33+
}).collect::<CargoResult<Vec<_>>>()?;
3434

3535
let mut lib_names = HashSet::new();
3636
let mut bin_names = HashSet::new();

0 commit comments

Comments
 (0)