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

Simplify ranges in pre-release hints (#825)

Browse source 
Closes https://github.com/astral-sh/puffin/issues/807.
This commit is contained in:
Charlie Marsh 2024-01-07 12:40:22 -05:00 • committed by GitHub
parent e6fcb9c4d3
commit 17452e3e64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/puffin-resolver/src/error.rs
View file

@ -15,9 +15,7 @@ use puffin_traits::OnceMap;
use pypi_types::BaseUrl;
use crate::candidate_selector::CandidateSelector;
use crate::pubgrub::{
PubGrubHints, PubGrubPackage, PubGrubPython, PubGrubReportFormatter, PubGrubVersion,
};
use crate::pubgrub::{PubGrubPackage, PubGrubPython, PubGrubReportFormatter, PubGrubVersion};
use crate::python_requirement::PythonRequirement;
use crate::version_map::VersionMap;
@ -146,7 +144,7 @@ impl std::fmt::Display for NoSolutionError {
// Include any additional hints.
if let Some(selector) = &self.selector {
for hint in PubGrubHints::from_derivation_tree(&self.derivation_tree, selector).iter() {
for hint in formatter.hints(&self.derivation_tree, selector) {
write!(f, "\n\n{hint}")?;
}
}

2
crates/puffin-resolver/src/pubgrub/mod.rs
View file

@ -2,7 +2,7 @@ pub(crate) use crate::pubgrub::dependencies::PubGrubDependencies;
pub(crate) use crate::pubgrub::distribution::PubGrubDistribution;
pub(crate) use crate::pubgrub::package::{PubGrubPackage, PubGrubPython};
pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority};
pub(crate) use crate::pubgrub::report::{PubGrubHints, PubGrubReportFormatter};
pub(crate) use crate::pubgrub::report::PubGrubReportFormatter;
pub(crate) use crate::pubgrub::specifier::PubGrubSpecifier;
pub(crate) use crate::pubgrub::version::{PubGrubVersion, MIN_VERSION};

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

@ -131,6 +131,7 @@ impl ReportFormatter<PubGrubPackage, Range<PubGrubVersion>> for PubGrubReportFor
}
impl PubGrubReportFormatter<'_> {
/// Simplify a [`Range`] of versions using the available versions for a package.
fn simplify_set<'a>(
&self,
set: &'a Range<PubGrubVersion>,
@ -142,20 +143,17 @@ impl PubGrubReportFormatter<'_> {
Cow::Owned(set.simplify(self.available_versions.get(package).into_iter().flatten()))
}
}
}
/// A set of hints to help users resolve errors by providing additional context or modifying
/// their requirements.
#[derive(Debug, Default)]
pub(crate) struct PubGrubHints(FxHashSet<PubGrubHint>);
impl PubGrubHints {
/// Create a set of hints from a derivation tree.
pub(crate) fn from_derivation_tree(
/// Generate the [`PubGrubHints`] for a derivation tree.
///
/// The [`PubGrubHints`] help users resolve errors by providing additional context or modifying
/// their requirements.
pub(crate) fn hints(
&self,
derivation_tree: &DerivationTree<PubGrubPackage, Range<PubGrubVersion>>,
selector: &CandidateSelector,
) -> Self {
let mut hints = Self::default();
) -> FxHashSet<PubGrubHint> {
let mut hints = FxHashSet::default();
match derivation_tree {
DerivationTree::External(external) => match external {
External::NoVersions(package, set) => {
@ -185,7 +183,7 @@ impl PubGrubHints {
if !allowed_prerelease {
hints.insert(PubGrubHint::NoVersionsWithPreRelease {
package: package.clone(),
range: set.clone(),
range: self.simplify_set(set, package).into_owned(),
});
}
}
@ -196,27 +194,12 @@ impl PubGrubHints {
External::FromDependencyOf(..) => {}
},
DerivationTree::Derived(derived) => {
hints.extend(Self::from_derivation_tree(&derived.cause1, selector));
hints.extend(Self::from_derivation_tree(&derived.cause2, selector));
hints.extend(self.hints(&derived.cause1, selector));
hints.extend(self.hints(&derived.cause2, selector));
}
}
hints
}
/// Iterate over the hints in the set.
pub(crate) fn iter(&self) -> impl Iterator<Item = &PubGrubHint> {
self.0.iter()
}
/// Insert a hint into the set.
fn insert(&mut self, hint: PubGrubHint) -> bool {
self.0.insert(hint)
}
/// Extend the set with another set of hints.
fn extend(&mut self, hints: Self) {
self.0.extend(hints.0);
}
}
#[derive(Derivative, Debug, Clone)]