Skip to content

Commit

Permalink
Don't use for loop on an Option
Browse files Browse the repository at this point in the history
  • Loading branch information
WaffleLapkin committed Sep 13, 2022
1 parent bd99c04 commit d8f8e8f
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions src/cargo/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,21 +386,19 @@ pub fn resolve_with_previous<'cfg>(
let keep = |p: &PackageId| pre_patch_keep(p) && !avoid_patch_ids.contains(p);

let dev_deps = ws.require_optional_deps() || has_dev_units == HasDevUnits::Yes;
// In the case where a previous instance of resolve is available, we
// want to lock as many packages as possible to the previous version
// without disturbing the graph structure.

if let Some(r) = previous {
trace!("previous: {:?}", r);

// In the case where a previous instance of resolve is available, we
// want to lock as many packages as possible to the previous version
// without disturbing the graph structure.
register_previous_locks(ws, registry, r, &keep, dev_deps);
}

// Prefer to use anything in the previous lock file, aka we want to have conservative updates.
for r in previous {
for id in r.iter() {
if keep(&id) {
debug!("attempting to prefer {}", id);
version_prefs.prefer_package_id(id);
}
// Prefer to use anything in the previous lock file, aka we want to have conservative updates.
for id in r.iter().filter(keep) {
debug!("attempting to prefer {}", id);
version_prefs.prefer_package_id(id);
}
}

Expand Down

0 comments on commit d8f8e8f

Please sign in to comment.