Skip to content
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

Better error messages on expect failures in resolver #1583

Merged
merged 2 commits into from
Feb 17, 2024
Merged

Better error messages on expect failures in resolver #1583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc0445
Better error messages on expect failures in resolver
hauntsaninja Feb 17, 2024
c8b2549
clippy
hauntsaninja Feb 17, 2024
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
26 changes: 18 additions & 8 deletions crates/uv-resolver/src/resolution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ impl ResolutionGraph {
if !metadata.provides_extras.contains(extra) {
let pinned_package = pins
.get(package_name, version)
.expect("Every package should be pinned")
.unwrap_or_else(|| {
panic!("Every package should be pinned: {package_name:?}")
})
.clone();

diagnostics.push(Diagnostic::MissingExtra {
Expand All @@ -130,14 +132,19 @@ impl ResolutionGraph {
});
}
} else {
let metadata = distributions
.get(&dist.package_id())
.expect("Every package should have metadata");
let metadata = distributions.get(&dist.package_id()).unwrap_or_else(|| {
panic!(
"Every package should have metadata: {:?}",
dist.package_id()
)
});

if !metadata.provides_extras.contains(extra) {
let pinned_package = pins
.get(package_name, version)
.expect("Every package should be pinned")
.unwrap_or_else(|| {
panic!("Every package should be pinned: {package_name:?}")
})
.clone();

diagnostics.push(Diagnostic::MissingExtra {
Expand All @@ -150,9 +157,12 @@ impl ResolutionGraph {
PubGrubPackage::Package(package_name, Some(extra), Some(url)) => {
// Validate that the `extra` exists.
let dist = PubGrubDistribution::from_url(package_name, url);
let metadata = distributions
.get(&dist.package_id())
.expect("Every package should have metadata");
let metadata = distributions.get(&dist.package_id()).unwrap_or_else(|| {
panic!(
"Every package should have metadata: {:?}",
dist.package_id()
)
});

if !metadata.provides_extras.contains(extra) {
let url = redirects.get(url).map_or_else(
Expand Down