Skip to content

Commit 2f7eb42

Browse files
committed
Revert "only whitelist packages we are keeping from the lockfile"
This reverts commit 4fb53e5
1 parent 756f54c commit 2f7eb42

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/cargo/core/registry.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,15 @@ impl<'cfg> PackageRegistry<'cfg> {
168168
self.add_source(source, Kind::Override);
169169
}
170170

171+
pub fn add_to_yanked_whitelist(&mut self, iter: impl Iterator<Item = PackageId>) {
172+
self.yanked_whitelist.extend(iter)
173+
}
174+
171175
pub fn register_lock(&mut self, id: PackageId, deps: Vec<PackageId>) {
172176
trace!("register_lock: {}", id);
173177
for dep in deps.iter() {
174178
trace!("\t-> {}", dep);
175179
}
176-
self.yanked_whitelist.insert(id);
177180
let sub_map = self
178181
.locked
179182
.entry(id.source_id())

src/cargo/ops/resolve.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ fn register_previous_locks(
471471
// package's dependencies here as that'll be covered below to poison those
472472
// if they changed.
473473
let mut avoid_locking = HashSet::new();
474+
registry.add_to_yanked_whitelist(resolve.iter());
474475
for node in resolve.iter() {
475476
if !keep(&node) {
476477
add_deps(resolve, node, &mut avoid_locking);

0 commit comments

Comments
 (0)