Add two Sendable annotations to enable building SourceKit-LSP in Swift 6 mode #7559
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
This allows us to build `SourceKitLSP` in Swift 6 mode.
This allows us to build `SourceKitLSP` in Swift 6 mode.
bnbarham
approved these changes
May 14, 2024
Comment on lines
-37
to
-38
| // This is not just a computed property because the ToolchainRegistryTests | ||
| // change the value. |
There was a problem hiding this comment.
I assume this comment wasn't true 😅? If that's the case though, can it just be a computed property?
There was a problem hiding this comment.
It was, ToolchainRegistryTests is in SourceKit-LSP: swiftlang/sourcekit-lsp#1276 (comment)
I prefer it to be stored so we don’t re-run uname every time the variable is accessed.
giginet
reviewed
May 15, 2024
| @@ -563,7 +563,7 @@ public struct TargetSourcesBuilder { | |||
| } | |||
|
|
|||
| /// Describes a rule for including a source or resource file in a target. | |||
| public struct FileRuleDescription { | |||
| public struct FileRuleDescription: Sendable { | |||
There was a problem hiding this comment.
Don't we need FileRuleDescription.Rule to conform to Sendable?
Because it is public.
There was a problem hiding this comment.
This change is trying to be minimal to get SourceKit-LSP building in Swift 6 mode. Adding proper Sendable annotations to SwiftPM wherever sensible is not a goal of this PR.
|
@swift-ci Please test |
|
@swift-ci Please test Linux |
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.
FileRuleDescriptionandPlatformasSendableand makePlatform.currenta constant. This allows us to build SourceKit-LSP in Swift 6 modeFileRuleDescriptionandPlatformif SwiftPM is used as a librarySendableconformances is safe and I don’t expect anyone to modifyPlatform.currentSendableannotations to enable building SourceKit-LSP in Swift 6 mode #7553