Skip to content

Commit cb53fa1

Browse files
authored
Merge pull request #2837 from ahoppen/6.0/enable-sending-arg
[6.0] Enable the `sendingArgsAndResults` experimental feature
2 parents 515f79b + 7aa2516 commit cb53fa1

File tree

6 files changed

+9
-32
lines changed

6 files changed

+9
-32
lines changed

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

+1-4
Original file line numberDiff line numberDiff line change
@@ -697,10 +697,7 @@ public enum Keyword: CaseIterable {
697697
case .throws:
698698
return KeywordSpec("throws", isLexerClassified: true)
699699
case .sending:
700-
return KeywordSpec(
701-
"sending",
702-
experimentalFeature: .sendingArgsAndResults
703-
)
700+
return KeywordSpec("sending")
704701
case .transpose:
705702
return KeywordSpec("transpose")
706703
case .true:

Sources/SwiftParser/Patterns.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ extension Parser.Lookahead {
377377
&& !self.at(.keyword(.__owned))
378378
&& !self.at(.keyword(.borrowing))
379379
&& !self.at(.keyword(.consuming))
380-
&& !(experimentalFeatures.contains(.sendingArgsAndResults) && self.at(.keyword(.sending)))
380+
&& !self.at(.keyword(.sending))
381381
&& !(experimentalFeatures.contains(.nonescapableTypes) && self.at(.keyword(._resultDependsOn)))
382382
{
383383
return true

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

+2-8
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,6 @@ extension DeclModifierSyntax {
810810
case `static`
811811
case unowned
812812
case weak
813-
#if compiler(>=5.8)
814-
@_spi(ExperimentalLanguageFeatures)
815-
#endif
816813
case sending
817814

818815
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
@@ -889,7 +886,7 @@ extension DeclModifierSyntax {
889886
self = .unowned
890887
case TokenSpec(.weak):
891888
self = .weak
892-
case TokenSpec(.sending) where experimentalFeatures.contains(.sendingArgsAndResults):
889+
case TokenSpec(.sending):
893890
self = .sending
894891
default:
895892
return nil
@@ -3343,9 +3340,6 @@ extension SimpleTypeSpecifierSyntax {
33433340
@_spi(ExperimentalLanguageFeatures)
33443341
#endif
33453342
case _resultDependsOn
3346-
#if compiler(>=5.8)
3347-
@_spi(ExperimentalLanguageFeatures)
3348-
#endif
33493343
case sending
33503344

33513345
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
@@ -3366,7 +3360,7 @@ extension SimpleTypeSpecifierSyntax {
33663360
self = .consuming
33673361
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonescapableTypes):
33683362
self = ._resultDependsOn
3369-
case TokenSpec(.sending) where experimentalFeatures.contains(.sendingArgsAndResults):
3363+
case TokenSpec(.sending):
33703364
self = .sending
33713365
default:
33723366
return nil

Sources/SwiftSyntax/generated/Keyword.swift

-3
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
211211
#endif
212212
case scoped
213213
case `self`
214-
#if compiler(>=5.8)
215-
@_spi(ExperimentalLanguageFeatures)
216-
#endif
217214
case sending
218215
case `Self`
219216
case Sendable

Tests/SwiftParserTest/DeclarationTests.swift

+3-12
Original file line numberDiff line numberDiff line change
@@ -3295,17 +3295,8 @@ final class DeclarationTests: ParserTestCase {
32953295
}
32963296

32973297
func testSendingTypeSpecifier() {
3298-
assertParse(
3299-
"func testVarDeclTupleElt() -> (sending String, String) {}",
3300-
experimentalFeatures: .sendingArgsAndResults
3301-
)
3302-
assertParse(
3303-
"func testVarDeclTuple2(_ x: (sending String)) {}",
3304-
experimentalFeatures: .sendingArgsAndResults
3305-
)
3306-
assertParse(
3307-
"func testVarDeclTuple2(_ x: (sending String, String)) {}",
3308-
experimentalFeatures: .sendingArgsAndResults
3309-
)
3298+
assertParse("func testVarDeclTupleElt() -> (sending String, String) {}")
3299+
assertParse("func testVarDeclTuple2(_ x: (sending String)) {}")
3300+
assertParse("func testVarDeclTuple2(_ x: (sending String, String)) {}")
33103301
}
33113302
}

Tests/SwiftParserTest/SendingTest.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ final class SendingTests: ParserTestCase {
1919
"""
2020
class Klass {}
2121
func transferMain(_ x: sending Klass) -> ()
22-
""",
23-
experimentalFeatures: .sendingArgsAndResults
22+
"""
2423
)
2524
}
2625

@@ -29,8 +28,7 @@ final class SendingTests: ParserTestCase {
2928
"""
3029
class Klass {}
3130
func transferMain(_ y: Klass, _ x: sending Klass, _ z: Klass) -> ()
32-
""",
33-
experimentalFeatures: .sendingArgsAndResults
31+
"""
3432
)
3533
}
3634
}

0 commit comments

Comments
 (0)