[Swift migrate] Handle migration for optional features #8711
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
In addition to upcoming and experimental features, handle migration for "optional" features (the only one now being StrictMemorySafety). Read optional features from the supported-features JSON coming from the compiler and use their provided flags. While here, use the newly-introduced "categories" field from the JSON to filter the list of categories rather than assuming it's the same as the feature name.
DougGregor
requested review from
bkhouri,
bripeticca,
cmcgee1024,
daveyc123,
dschaefer2,
jakepetroules,
owenv,
plemarquand and
shawnhyam
as code owners
Member
Author
|
@swift-ci please test |
Contributor
|
@DougGregor looks like the failure is related to manifest update: |
Member
Author
|
@swift-ci please test |
Member
Author
|
I had a bad merge; fixed that and improved testing of the "categories" part. |
Member
Author
|
@swift-ci please test Linux |
Member
Author
|
@swift-ci please test Windows |
AnthonyLatsis
approved these changes
May 23, 2025
Contributor
AnthonyLatsis
left a comment
AnthonyLatsis
left a comment
There was a problem hiding this comment.
Awesome, thank you!
Comment on lines
+62
to
+69
| public var categories: [String] { | ||
| switch self { | ||
| case .optional(name: _, migratable: _, categories: let categories, flagName: _), | ||
| .upcoming(name: _, migratable: _, categories: let categories, enabledIn: _), | ||
| .experimental(name: _, migratable: _, categories: let categories): | ||
| categories | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Makes me want a feature to write self.categories.
…w comments Pass migration flags for optional features through -Xfrontend. The driver will get updated, but separately. Address some code review comments from improve the code. Thanks, Anthony!
Member
Author
|
@swift-ci please test |
dschaefer2
approved these changes
May 23, 2025
Member
|
@swift-ci please test windows |
Member
|
@swift-ci please test self hosted windows |
Member
Author
|
@swift-ci please test windows |
Contributor
|
@swift-ci please test self hosted Windows |
Contributor
|
Merging to unblock #8684. |
DougGregor
added a commit
to DougGregor/swift-package-manager
that referenced
this pull request
May 30, 2025
In addition to upcoming and experimental features, handle migration for "optional" features (the only one now being StrictMemorySafety). Read optional features from the supported-features JSON coming from the compiler and use their provided flags. While here, use the newly-introduced "categories" field from the JSON to filter the list of categories rather than assuming it's the same as the feature name.
DougGregor
added a commit
that referenced
this pull request
May 31, 2025
…8748) Explanation: Expand migration support to cover optional features like strict memory safety, in addition to upcoming features. While here, also add a test for migration to inferring isolated conformances. Scope: Limited to the migrator. Original PR: #8711 Risk: Very low; it's limited to the migrator. Testing: CI Reviewed by: @xedin, @AnthonyLatsis
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
In addition to upcoming and experimental features, handle migration for "optional" features (the only one now being StrictMemorySafety). Read optional features from the supported-features JSON coming from the compiler and use their provided flags.
While here, use the newly-introduced "categories" field from the JSON to filter the list of categories rather than assuming it's the same as the feature name.