[Traits] Fix traits omitting used package dependencies #8399
Conversation
This file contains hidden or 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
- Modify the calculation done for target dependencies that are trait-guarded, and consider cases where target deps that reference the same package could have both instances of being trait-guarded and not trait-guarded. - Expand on test case that checks for the appropriate trait-guarded target deps TODO: - update method descriptions for trait-guarded target deps - add more test cases to ensure correctness
- Add more checks in Manifest tests to assure that dependencies are only considered guarded/unused if every instance of a target dependency referring to a package is guarded/unused - Add description to new traitGuardedTargetDependencies methods/implementations.
|
@swift-ci please test |
bripeticca
requested review from
MaxDesiatov,
bkhouri,
bnbarham,
cmcgee1024,
daveyc123,
dschaefer2,
jakepetroules,
owenv,
plemarquand,
shawnhyam and
xedin
as code owners
MaxDesiatov
reviewed
Mar 25, 2025
MaxDesiatov
reviewed
Mar 25, 2025
MaxDesiatov
reviewed
Mar 25, 2025
- Fix the formatting for `Manifest.swift` - Clarify what the return values represent for the `traitGuardedTargetDependencies` methods - Cleanup + renaming
|
@swift-ci please test |
MaxDesiatov
reviewed
Mar 25, 2025
MaxDesiatov
approved these changes
Mar 25, 2025
|
@swift-ci please test |
|
@swift-ci please test windows |
1 similar comment
|
@swift-ci please test windows |
|
Good to merge? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #8398
Used package dependencies of a manifest were considered trait-guarded if a target dependency in the manifest:
regardless as to whether the same package dependency was used elsewhere (whether in the same target or another in the same manifest) and was not guarded by traits.
This change ensures that this is considered when doing the calculations for package dependencies that should be omitted if every target dependency that uses said package dependency is guarded.