From 94076d600089aac3a37ee95cdf9d05bd8935f37e Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Tue, 2 Jan 2024 22:26:56 -0400 Subject: [PATCH] Use dependency package when simplifying dependency set (#747) This manifested itself here: https://github.com/astral-sh/puffin/pull/745/files#r1439912440. --- crates/puffin-resolver/src/pubgrub/report.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/puffin-resolver/src/pubgrub/report.rs b/crates/puffin-resolver/src/pubgrub/report.rs index 68735712b..58627546a 100644 --- a/crates/puffin-resolver/src/pubgrub/report.rs +++ b/crates/puffin-resolver/src/pubgrub/report.rs @@ -68,7 +68,7 @@ impl ReportFormatter> for PubGrubReportFor if package_set == &Range::full() && dependency_set == &Range::full() { format!("{package} depends on {dependency}") } 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}") } else if dependency_set == &Range::full() { if matches!(package, PubGrubPackage::Root(_)) { @@ -79,7 +79,7 @@ impl ReportFormatter> for PubGrubReportFor format!("{package}{package_set} depends on {dependency}") } } else { - let dependency_set = self.simplify_set(dependency_set, package); + let dependency_set = self.simplify_set(dependency_set, dependency); if matches!(package, PubGrubPackage::Root(_)) { // Exclude the dummy version for root packages format!("{package} depends on {dependency}{dependency_set}")