Rename pinned_package to dist (#3598)

This commit is contained in:
Charlie Marsh 2024-05-14 20:42:27 -04:00 committed by GitHub
parent 9a18d4ff46
commit 85c71d6987
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -79,7 +79,7 @@ impl ResolutionGraph {
.or_insert_with(Vec::new) .or_insert_with(Vec::new)
.push(extra.clone()); .push(extra.clone());
} else { } else {
let pinned_package = pins let dist = pins
.get(package_name, version) .get(package_name, version)
.unwrap_or_else(|| { .unwrap_or_else(|| {
panic!("Every package should be pinned: {package_name:?}") panic!("Every package should be pinned: {package_name:?}")
@ -87,7 +87,7 @@ impl ResolutionGraph {
.clone(); .clone();
diagnostics.push(Diagnostic::MissingExtra { diagnostics.push(Diagnostic::MissingExtra {
dist: pinned_package, dist,
extra: extra.clone(), extra: extra.clone(),
}); });
} }
@ -100,11 +100,10 @@ impl ResolutionGraph {
.or_insert_with(Vec::new) .or_insert_with(Vec::new)
.push(extra.clone()); .push(extra.clone());
} else { } else {
let pinned_package = let dist = Dist::from_editable(package_name.clone(), editable.clone())?;
Dist::from_editable(package_name.clone(), editable.clone())?;
diagnostics.push(Diagnostic::MissingExtra { diagnostics.push(Diagnostic::MissingExtra {
dist: pinned_package.into(), dist: dist.into(),
extra: extra.clone(), extra: extra.clone(),
}); });
} }
@ -131,11 +130,11 @@ impl ResolutionGraph {
.or_insert_with(Vec::new) .or_insert_with(Vec::new)
.push(extra.clone()); .push(extra.clone());
} else { } else {
let pinned_package = let dist =
Dist::from_url(package_name.clone(), url_to_precise(url.clone()))?; Dist::from_url(package_name.clone(), url_to_precise(url.clone()))?;
diagnostics.push(Diagnostic::MissingExtra { diagnostics.push(Diagnostic::MissingExtra {
dist: pinned_package.into(), dist: dist.into(),
extra: extra.clone(), extra: extra.clone(),
}); });
} }