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

feat: merge dependencies for better error messages #163

Merged
merged 8 commits into from
Dec 17, 2023
Merged

feat: merge dependencies for better error messages #163

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab71a9f
bad error test
Eh2406 Dec 1, 2023
8b4378e
feat: merge direct dependencies
Eh2406 Dec 1, 2023
43be97c
separate function for clearer documentation
Eh2406 Dec 1, 2023
c646d3c
Update doc comments for merge_dependency
mpizenberg Dec 15, 2023
4c5800e
Rename merge_dependency into merge_dependants
mpizenberg Dec 15, 2023
c22f498
Use american english dependent instead of dependant
mpizenberg Dec 15, 2023
8a25f57
Rename dependencies into merged_dependencies
mpizenberg Dec 15, 2023
5c4a6b9
Typo mergeed -> merged
mpizenberg Dec 15, 2023
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
Prev Previous commit
Typo mergeed -> merged
  • Loading branch information
@mpizenberg
mpizenberg committed Dec 15, 2023
commit 5c4a6b92e736ebc044cc53fb5a407dfa68ca0b0f
4 changes: 2 additions & 2 deletions src/internal/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,12 @@ impl<P: Package, VS: VersionSet, Priority: Ord + Clone> State<P, VS, Priority> {
.merged_dependencies
.entry((p1.clone(), p2.clone()))
.or_default();
if let Some((past, mergeed)) = deps_lookup.as_mut_slice().iter_mut().find_map(|past| {
if let Some((past, merged)) = deps_lookup.as_mut_slice().iter_mut().find_map(|past| {
self.incompatibility_store[id]
.merge_dependents(&self.incompatibility_store[*past])
.map(|m| (past, m))
}) {
let new = self.incompatibility_store.alloc(mergeed);
let new = self.incompatibility_store.alloc(merged);
for (pkg, _) in self.incompatibility_store[new].iter() {
self.incompatibilities
.entry(pkg.clone())
Expand Down