Skip to content

Commit

Permalink
only whitelist packages we are keeping from the lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Eh2406 committed Jan 29, 2019
1 parent 4400514 commit 4fb53e5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 1 addition & 4 deletions src/cargo/core/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,12 @@ impl<'cfg> PackageRegistry<'cfg> {
self.add_source(source, Kind::Override);
}

pub fn add_to_yanked_whitelist(&mut self, iter: impl Iterator<Item = PackageId>) {
self.yanked_whitelist.extend(iter)
}

pub fn register_lock(&mut self, id: PackageId, deps: Vec<PackageId>) {
trace!("register_lock: {}", id);
for dep in deps.iter() {
trace!("\t-> {}", dep);
}
self.yanked_whitelist.insert(id);
let sub_map = self
.locked
.entry(id.source_id())
Expand Down
1 change: 0 additions & 1 deletion src/cargo/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ fn register_previous_locks(
// package's dependencies here as that'll be covered below to poison those
// if they changed.
let mut avoid_locking = HashSet::new();
registry.add_to_yanked_whitelist(resolve.iter());
for node in resolve.iter() {
if !keep(&node) {
add_deps(resolve, node, &mut avoid_locking);
Expand Down

0 comments on commit 4fb53e5

Please sign in to comment.