Skip to content

cargo_compile: iterate packages once, not three times #4494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2017
Merged

cargo_compile: iterate packages once, not three times #4494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d4e71
cargo_compile: iterate packages once, not three times
RalfJung Sep 14, 2017
f490f16
use iterator combinators rather than for loops
RalfJung Sep 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/cargo/ops/cargo_compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,22 +231,17 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
&specs)?;
let (packages, resolve_with_overrides) = resolve;

let mut pkgids = Vec::new();
if specs.len() > 0 {
for p in specs.iter() {
pkgids.push(p.query(resolve_with_overrides.iter())?);
}
} else {
if specs.is_empty() {
return Err(format!("manifest path `{}` contains no package: The manifest is virtual, \
and the workspace has no members.", ws.current_manifest().display()).into());
};

let to_builds = pkgids.iter().map(|id| {
packages.get(id)
}).collect::<CargoResult<Vec<_>>>()?;
for p in to_builds.iter() {
let to_builds = specs.iter().map(|p| {
let pkgid = p.query(resolve_with_overrides.iter())?;
let p = packages.get(pkgid)?;
p.manifest().print_teapot(ws.config());
}
Ok(p)
}).collect::<CargoResult<Vec<_>>>()?;

let mut general_targets = Vec::new();
let mut package_targets = Vec::new();
Expand Down
12 changes: 6 additions & 6 deletions src/cargo/ops/cargo_doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ pub fn doc(ws: &Workspace, options: &DocOptions) -> CargoResult<()> {
&specs)?;
let (packages, resolve_with_overrides) = resolve;

let mut pkgs = Vec::new();
if specs.len() > 0 {
for p in specs.iter() {
pkgs.push(packages.get(p.query(resolve_with_overrides.iter())?)?);
}
} else {
if specs.is_empty() {
return Err(format!("manifest path `{}` contains no package: The manifest is virtual, \
and the workspace has no members.", ws.current_manifest().display()).into());
};

let pkgs = specs.iter().map(|p| {
let pkgid = p.query(resolve_with_overrides.iter())?;
packages.get(pkgid)
}).collect::<CargoResult<Vec<_>>>()?;

let mut lib_names = HashSet::new();
let mut bin_names = HashSet::new();
for package in &pkgs {
Expand Down