Simplify Resolution type
#5301
Merged
Simplify Resolution type
#5301
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
| /// The resolution from one or more forks including the virtual packages and the edges between them. | ||
| /// | ||
| /// Each package can have multiple versions and each edge between two packages can have multiple | ||
| /// version specifiers to support diverging versions and requirements in different forks. | ||
| #[derive(Debug, Default)] | ||
| pub(crate) struct Resolution { | ||
| pub(crate) packages: FxHashMap<ResolutionPackage, FxHashSet<Version>>, |
There was a problem hiding this comment.
Should we rename this field to nodes?
There was a problem hiding this comment.
E.g. "nodes and edges" rather than "packages and edges"
charliermarsh
approved these changes
Jul 22, 2024
konstin
force-pushed
the
konsti/save-forks-in-lockfile
branch
from
f4ba2d3 to
0a08734
Compare
BurntSushi
reviewed
Jul 23, 2024
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.
Looking at how to merge identical forks, i found that the
Resolutioncan be simplified by treating it as a nodes and edges store (plus pins, they are separate since they are per name-version, not per (virtual-)package-version). This should also make #5294 more apparent, which i didn't touch here.I additionally added some doc comments to the
Resolutiontypes.