From b6d1a2ab057d778518b6eba4d4d13992a07aca85 Mon Sep 17 00:00:00 2001 From: Zanie Date: Thu, 25 Jan 2024 18:15:09 -0600 Subject: [PATCH] Use `simplify_set` utility in term formatting --- crates/puffin-resolver/src/pubgrub/report.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/crates/puffin-resolver/src/pubgrub/report.rs b/crates/puffin-resolver/src/pubgrub/report.rs index d84b53f8e..8392dac48 100644 --- a/crates/puffin-resolver/src/pubgrub/report.rs +++ b/crates/puffin-resolver/src/pubgrub/report.rs @@ -136,24 +136,14 @@ impl ReportFormatter> for PubGrubReportFormatter< match terms_vec.as_slice() { [] | [(PubGrubPackage::Root(_), _)] => "the requirements are unsatisfiable".into(), [(package @ PubGrubPackage::Package(..), Term::Positive(range))] => { - let range = range.simplify( - self.available_versions - .get(*package) - .unwrap_or(&BTreeSet::new()) - .iter(), - ); + let range = self.simplify_set(range, package); format!( "{} cannot be used", PackageRange::compatibility(package, &range) ) } [(package @ PubGrubPackage::Package(..), Term::Negative(range))] => { - let range = range.simplify( - self.available_versions - .get(*package) - .unwrap_or(&BTreeSet::new()) - .iter(), - ); + let range = self.simplify_set(range, package); format!( "{} must be used", PackageRange::compatibility(package, &range)