mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-30 15:27:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use dependency package when simplifying dependency set (#747)

Browse source 
This manifested itself here:
https://github.com/astral-sh/puffin/pull/745/files#r1439912440.
This commit is contained in:
Charlie Marsh 2024-01-02 22:26:56 -04:00 • committed by GitHub
parent 26f597a787
commit 94076d6000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/puffin-resolver/src/pubgrub/report.rs
View file

@ -68,7 +68,7 @@ impl ReportFormatter<PubGrubPackage, Range<PubGrubVersion>> for PubGrubReportFor
if package_set == &Range::full() && dependency_set == &Range::full() { if package_set == &Range::full() && dependency_set == &Range::full() {
format!("{package} depends on {dependency}") format!("{package} depends on {dependency}")
} else if package_set == &Range::full() { } else if package_set == &Range::full() {
let dependency_set = self.simplify_set(dependency_set, package); let dependency_set = self.simplify_set(dependency_set, dependency);
format!("{package} depends on {dependency}{dependency_set}") format!("{package} depends on {dependency}{dependency_set}")
} else if dependency_set == &Range::full() { } else if dependency_set == &Range::full() {
if matches!(package, PubGrubPackage::Root(_)) { if matches!(package, PubGrubPackage::Root(_)) {
@ -79,7 +79,7 @@ impl ReportFormatter<PubGrubPackage, Range<PubGrubVersion>> for PubGrubReportFor
format!("{package}{package_set} depends on {dependency}") format!("{package}{package_set} depends on {dependency}")
} }
} else { } else {
let dependency_set = self.simplify_set(dependency_set, package); let dependency_set = self.simplify_set(dependency_set, dependency);
if matches!(package, PubGrubPackage::Root(_)) { if matches!(package, PubGrubPackage::Root(_)) {
// Exclude the dummy version for root packages // Exclude the dummy version for root packages
format!("{package} depends on {dependency}{dependency_set}") format!("{package} depends on {dependency}{dependency_set}")