Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a reason to the NoVersions incompatibility #21

Closed
wants to merge 1 commit into from
Closed

Add a reason to the NoVersions incompatibility #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/internal/incompatibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ pub type IncompId<P, VS> = Id<Incompatibility<P, VS>>;
pub enum Kind<P: Package, VS: VersionSet> {
/// Initial incompatibility aiming at picking the root package for the first decision.
NotRoot(P, VS::V),
/// There are no versions in the given range for this package.
NoVersions(P, VS),
/// There are no versions in the given range for this package. A string reason is included.
NoVersions(P, VS, String),
/// The package is unavailable for versions in the range. A string reason is included.
Unavailable(P, VS, String),
/// Incompatibility coming from the dependencies of a given package.
Expand Down Expand Up @@ -84,14 +84,14 @@ impl<P: Package, VS: VersionSet> Incompatibility<P, VS> {

/// Create an incompatibility to remember
/// that a given set does not contain any version.
pub fn no_versions(package: P, term: Term<VS>) -> Self {
pub fn no_versions(package: P, term: Term<VS>, reason: String) -> Self {
let set = match &term {
Term::Positive(r) => r.clone(),
Term::Negative(_) => panic!("No version should have a positive term"),
};
Self {
package_terms: SmallMap::One([(package.clone(), term)]),
kind: Kind::NoVersions(package, set),
kind: Kind::NoVersions(package, set, reason),
}
}

Expand Down Expand Up @@ -242,9 +242,9 @@ impl<P: Package, VS: VersionSet> Incompatibility<P, VS> {
Kind::NotRoot(package, version) => {
DerivationTree::External(External::NotRoot(package.clone(), version.clone()))
}
Kind::NoVersions(package, set) => {
DerivationTree::External(External::NoVersions(package.clone(), set.clone()))
}
Kind::NoVersions(package, set, reason) => DerivationTree::External(
External::NoVersions(package.clone(), set.clone(), reason.clone()),
),
Kind::Unavailable(package, set, reason) => DerivationTree::External(
External::Unavailable(package.clone(), set.clone(), reason.clone()),
),
Expand Down
18 changes: 9 additions & 9 deletions src/report.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ pub enum DerivationTree<P: Package, VS: VersionSet> {
pub enum External<P: Package, VS: VersionSet> {
/// Initial incompatibility aiming at picking the root package for the first decision.
NotRoot(P, VS::V),
/// There are no versions in the given set for this package.
NoVersions(P, VS),
/// There are no versions in the given set for this package. A string reason is included.
NoVersions(P, VS, String),
/// The package is unusable in the given set. A string reason is included.
Unavailable(P, VS, String),
/// Incompatibility coming from the dependencies of a given package.
Expand Down Expand Up @@ -81,7 +81,7 @@ impl<P: Package, VS: VersionSet> DerivationTree<P, VS> {
packages.insert(p);
packages.insert(p2);
}
External::NoVersions(p, _)
External::NoVersions(p, _, _)
| External::NotRoot(p, _)
| External::Unavailable(p, ..) => {
packages.insert(p);
Expand Down Expand Up @@ -109,14 +109,14 @@ impl<P: Package, VS: VersionSet> DerivationTree<P, VS> {
DerivationTree::External(_) => {}
DerivationTree::Derived(derived) => {
match (derived.cause1.deref_mut(), derived.cause2.deref_mut()) {
(DerivationTree::External(External::NoVersions(p, r)), ref mut cause2) => {
(DerivationTree::External(External::NoVersions(p, r, _)), ref mut cause2) => {
cause2.collapse_no_versions();
*self = cause2
.clone()
.merge_no_versions(p.to_owned(), r.to_owned())
.unwrap_or_else(|| self.to_owned());
}
(ref mut cause1, DerivationTree::External(External::NoVersions(p, r))) => {
(ref mut cause1, DerivationTree::External(External::NoVersions(p, r, _))) => {
cause1.collapse_no_versions();
*self = cause1
.clone()
Expand All @@ -140,9 +140,9 @@ impl<P: Package, VS: VersionSet> DerivationTree<P, VS> {
DerivationTree::External(External::NotRoot(_, _)) => {
panic!("How did we end up with a NoVersions merged with a NotRoot?")
}
DerivationTree::External(External::NoVersions(_, r)) => Some(DerivationTree::External(
External::NoVersions(package, set.union(&r)),
)),
//
// Cannot be merged because the reason may not match
DerivationTree::External(External::NoVersions(_, _, _)) => None,
// Cannot be merged because the reason may not match
DerivationTree::External(External::Unavailable(_, _, _)) => None,
DerivationTree::External(External::FromDependencyOf(p1, r1, p2, r2)) => {
Expand Down Expand Up @@ -172,7 +172,7 @@ impl<P: Package, VS: VersionSet> fmt::Display for External<P, VS> {
Self::NotRoot(package, version) => {
write!(f, "we are solving dependencies of {} {}", package, version)
}
Self::NoVersions(package, set) => {
Self::NoVersions(package, set, _) => {
if set == &VS::full() {
write!(f, "there is no available version for {}", package)
} else {
Expand Down
6 changes: 5 additions & 1 deletion src/solver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ pub fn resolve<P: Package, VS: VersionSet, DP: DependencyProvider<P, VS>>(
// Pick the next compatible version.
let v = match decision {
None => {
let inc = Incompatibility::no_versions(next.clone(), term_intersection.clone());
let inc = Incompatibility::no_versions(
next.clone(),
term_intersection.clone(),
"no compatible versions".to_string(),
);
state.add_incompatibility(inc);
continue;
}
Expand Down
Loading