[DO NOT LAND] unify packages in ptb logic #20827
Draft
+388
−14
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
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
2 Skipped Deployments
|
tzakian
force-pushed
the
tzakian/wip-package-unification
branch
from
c7e35f9 to
9bbf9a6
Compare
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
tnowacki
reviewed
Jan 10, 2025
| } | ||
|
|
||
| impl ConflictResolution { | ||
| pub fn unify(&mut self, other: &ConflictResolution) -> anyhow::Result<()> { |
There was a problem hiding this comment.
Nit, I'd prefer
Suggested change
| pub fn unify(&mut self, other: &ConflictResolution) -> anyhow::Result<()> { | |
| pub fn unify(&self, other: &ConflictResolution) -> anyhow::Result<ConflictResolution> { |
There was a problem hiding this comment.
I always find these sort of mutable unifications harder to follow (but maybe thats just me)
There was a problem hiding this comment.
FWIW I significantly prefer them due to their efficiency improvements. In this instance, switching to return the value would require us to update the BTreeMap every time we do unification (or at least call std::mem::replace at each call), whereas this does it directly.
| } | ||
| // If we have two exact resolutions, they must be the same. | ||
| (ConflictResolution::Exact(sv, self_id), ConflictResolution::Exact(ov, other_id)) => { | ||
| if self_id != other_id { |
There was a problem hiding this comment.
I'm confused. Why aren't we checking the sv and ov?
There was a problem hiding this comment.
Is it because if the ids are the same, the sequence number should also be the same?
There was a problem hiding this comment.
Correct. But it doesn't hurt to double-check.
Comment on lines
85
to
90
| ConflictResolution::Exact(exact_version, self_id), | ||
| ConflictResolution::AtLeast(at_least_version, oid), | ||
| ) | ||
| | ( | ||
| ConflictResolution::AtLeast(at_least_version, oid), | ||
| ConflictResolution::Exact(exact_version, self_id), |
There was a problem hiding this comment.
nit
Suggested change
| ConflictResolution::Exact(exact_version, self_id), | |
| ConflictResolution::AtLeast(at_least_version, oid), | |
| ) | |
| | ( | |
| ConflictResolution::AtLeast(at_least_version, oid), | |
| ConflictResolution::Exact(exact_version, self_id), | |
| ConflictResolution::Exact(exact_version, exact_id), | |
| ConflictResolution::AtLeast(at_least_version, at_least_id), | |
| ) | |
| | ( | |
| ConflictResolution::AtLeast(at_least_version, exact_id), | |
| ConflictResolution::Exact(exact_version, at_least_id), |
cgswords
reviewed
Jan 13, 2025
Comment on lines
368
to
375
| if unification_table.contains_key(&package.original_package_id()) { | ||
| let existing_unifier = unification_table | ||
| .get_mut(&package.original_package_id()) | ||
| .expect("Guaranteed to exist"); | ||
| existing_unifier.unify(&resolution)?; | ||
| } else { | ||
| unification_table.insert(package.original_package_id(), resolution); | ||
| } |
There was a problem hiding this comment.
unification_table
.entry(&package.original_package_id())
.and_modify(|existing_unifier| { existing_unifier.unify(&resolution)?; })
.or_insert(resolution);
cgswords
reviewed
Jan 13, 2025
Comment on lines
329
to
342
| for object_id in self.non_entry_functions.iter() { | ||
| Self::add_and_unify( | ||
| &mut unification_table, | ||
| &self.all_packages, | ||
| object_id, | ||
| |pkg| { | ||
| if linking_config.fix_top_level_functions { | ||
| ConflictResolution::Exact(pkg.version(), pkg.id()) | ||
| } else { | ||
| ConflictResolution::AtLeast(pkg.version(), *object_id) | ||
| } | ||
| }, | ||
| )?; | ||
| } |
There was a problem hiding this comment.
A small nit for logic like this: consider moving it onto the linking_config, as:
for object_id in self.non_entry_functions.iter() {
Self::add_and_unify(
&mut unification_table,
&self.all_packages,
object_id,
|pkg| linking_config.generate_top_level_function_constraint(pkg.version(), pkg.id(), object_id)
)?;
}
That way as the flags grow, we do not need to update their usage across the file; we can just ask the config what it should be.
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
tzakian
force-pushed
the
tzakian/wip-package-unification
branch
from
45b83d3 to
5156d26
Compare
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
tzakian
force-pushed
the
tzakian/wip-package-unification
branch
from
5156d26 to
86aabc3
Compare
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
tzakian
force-pushed
the
tzakian/wip-package-unification
branch
from
86aabc3 to
57c7ce6
Compare
tzakian
temporarily deployed
to
sui-typescript-aws-kms-test-env
GitHub Actions
Inactive
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.
Description
Describe the changes or additions included in this PR.
Test plan
How did you test the new or updated feature?
Release notes
Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required.
For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates.