Unify resolutions only during graph building #5479
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With our previous eager union, we were losing the fork markers. We now carry this information into the resolution graph construction and, in the next step, can read the markers there.
BurntSushi
approved these changes
Jul 26, 2024
| #[derive(Debug)] | ||
| pub(crate) struct Resolution { | ||
| pub(crate) nodes: FxHashMap<ResolutionPackage, FxHashSet<Version>>, | ||
| pub(crate) nodes: FxHashMap<ResolutionPackage, Version>, |
There was a problem hiding this comment.
Ah nice, because each resolution is only allowed one version of a package, and Resolution no longer needs to represent the union of all resolutions since we merge them right into the graph?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With our previous eager union, we were losing the fork markers. We now carry this information into the resolution graph construction and, in the next step, can read the markers there.
Part of #5180 (comment)