Skip to content

Fix panic on lockfile choice' source not in any deps #300

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

Open
micprog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix panic on lockfile choice' source not in any deps #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion src/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,30 @@ impl<'ctx> DependencyResolver<'ctx> {
break (decision.0.clone(), *decision.1);
}
};
let indices = self.req_indices(name, &decision.0, sources.get(&decision.1).unwrap());
let source = match sources.get(&decision.1) {
Some(src) => src,
None => {
// This may happen if the choice is from the provided lockfile.
// Check for the source among the locked dependencies.
if let Ok(new_versions) =
rt.block_on(io.dependency_versions(decision.1, None, None))
{
sources.insert(
decision.1,
DependencyReference::new(decision.1, new_versions.clone()),
);
&DependencyReference::new(decision.1, new_versions.clone())
} else {
bail!(
"Dependency `{}` from `{}` not found among sources for `{}`",
name,
self.sess.dependency_source(decision.1),
name
)
}
}
};
let indices = self.req_indices(name, &decision.0, source);
match indices {
Ok(ref v) if !v.is_empty() => Ok((decision.1, v.clone())),
_ => {
Expand Down