Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `simplify_set` utility in term formatting

This commit is contained in:
Zanie 2024-01-25 18:15:09 -06:00
parent 3a05ef5285
commit b6d1a2ab05
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/puffin-resolver/src/pubgrub/report.rs
View File

@ -136,24 +136,14 @@ impl ReportFormatter<PubGrubPackage, Range<Version>> for PubGrubReportFormatter<
match terms_vec.as_slice() { match terms_vec.as_slice() {
[] | [(PubGrubPackage::Root(_), _)] => "the requirements are unsatisfiable".into(), [] | [(PubGrubPackage::Root(_), _)] => "the requirements are unsatisfiable".into(),
[(package @ PubGrubPackage::Package(..), Term::Positive(range))] => { [(package @ PubGrubPackage::Package(..), Term::Positive(range))] => {
let range = range.simplify( let range = self.simplify_set(range, package);
self.available_versions
.get(*package)
.unwrap_or(&BTreeSet::new())
.iter(),
);
format!( format!(
"{} cannot be used", "{} cannot be used",
PackageRange::compatibility(package, &range) PackageRange::compatibility(package, &range)
) )
} }
[(package @ PubGrubPackage::Package(..), Term::Negative(range))] => { [(package @ PubGrubPackage::Package(..), Term::Negative(range))] => {
let range = range.simplify( let range = self.simplify_set(range, package);
self.available_versions
.get(*package)
.unwrap_or(&BTreeSet::new())
.iter(),
);
format!( format!(
"{} must be used", "{} must be used",
PackageRange::compatibility(package, &range) PackageRange::compatibility(package, &range)