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.

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

Add DerivationTree.packages() -> HashSet<&P> #219

Merged
merged 3 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::sync::Arc;

use crate::package::Package;
use crate::term::Term;
use crate::type_aliases::Map;
use crate::type_aliases::{Map, Set};
use crate::version_set::VersionSet;

/// Reporter trait.
Expand Down Expand Up @@ -71,6 +71,32 @@ pub struct Derived<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display>
}

impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> DerivationTree<P, VS, M> {
/// Get all packages referred to in the derivation tree.
pub fn packages(&self) -> Set<&P> {
let mut packages = Set::default();
match self {
Self::External(external) => match external {
External::FromDependencyOf(p, _, p2, _) => {
packages.insert(p);
packages.insert(p2);
}
External::NoVersions(p, _)
| External::NotRoot(p, _)
| External::Custom(p, _, _) => {
packages.insert(p);
}
},
Self::Derived(derived) => {
// Less efficient than recursing with a `&mut Set<&P>`, but it's sufficient for
// small to medium-sized inputs such as a single `DerivationTree`.
packages.extend(derived.terms.keys());
packages.extend(derived.cause1.packages().iter());
konstin marked this conversation as resolved.
Show resolved Hide resolved
packages.extend(derived.cause2.packages().iter());
}
}
packages
}

/// Merge the [NoVersions](External::NoVersions) external incompatibilities
/// with the other one they are matched with
/// in a derived incompatibility.
Expand Down
16 changes: 14 additions & 2 deletions tests/examples.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use pubgrub::error::PubGrubError;
use pubgrub::range::Range;
use pubgrub::report::{DefaultStringReporter, Reporter as _};
use pubgrub::solver::{resolve, OfflineDependencyProvider};
use pubgrub::type_aliases::Map;
use pubgrub::type_aliases::{Map, Set};
use pubgrub::version::SemanticVersion;

type NumVS = Range<u32>;
Expand Down Expand Up @@ -217,13 +217,20 @@ fn confusing_with_lots_of_holes() {
let mut dependency_provider = OfflineDependencyProvider::<&str, NumVS>::new();

// root depends on foo...
dependency_provider.add_dependencies("root", 1u32, vec![("foo", Range::full())]);
dependency_provider.add_dependencies(
"root",
1u32,
vec![("foo", Range::full()), ("baz", Range::full())],
);

for i in 1..6 {
// foo depends on bar...
dependency_provider.add_dependencies("foo", i as u32, vec![("bar", Range::full())]);
}

// This package is part of the dependency tree, but it's not part of the conflict
dependency_provider.add_dependencies("baz", 1u32, vec![]);

let Err(PubGrubError::NoSolution(mut derivation_tree)) =
resolve(&dependency_provider, "root", 1u32)
else {
Expand All @@ -239,4 +246,9 @@ And because there is no version of foo in <1 | >1, <2 | >2, <3 | >3, <4 | >4, <5
&DefaultStringReporter::report(&derivation_tree),
"Because foo depends on bar and root 1 depends on foo, root 1 is forbidden."
);
assert_eq!(
derivation_tree.packages(),
// baz isn't shown.
Set::from_iter(&["root", "foo", "bar"])
);
}