Skip to content

Commit 935d756

Browse files
committed
[sending] Remove support for parsing transferring.
rdar://130253724 (cherry picked from commit 00c5e73)
1 parent 2a4f370 commit 935d756

File tree

10 files changed

+9
-39
lines changed

10 files changed

+9
-39
lines changed

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,6 @@ public let DECL_NODES: [Node] = [
469469
.keyword(._resultDependsOnSelf),
470470
.keyword(.required),
471471
.keyword(.static),
472-
.keyword(.transferring),
473472
.keyword(.unowned),
474473
.keyword(.weak),
475474
.keyword(.sending),

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public enum ExperimentalFeature: String, CaseIterable {
1717
case thenStatements
1818
case doExpressions
1919
case nonescapableTypes
20-
case transferringArgsAndResults
2120
case borrowingSwitch
2221
case sendingArgsAndResults
2322

@@ -32,8 +31,6 @@ public enum ExperimentalFeature: String, CaseIterable {
3231
return "'do' expressions"
3332
case .nonescapableTypes:
3433
return "NonEscableTypes"
35-
case .transferringArgsAndResults:
36-
return "TransferringArgsAndResults"
3734
case .borrowingSwitch:
3835
return "borrowing pattern matching"
3936
case .sendingArgsAndResults:

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ public enum Keyword: CaseIterable {
281281
case then
282282
case `throw`
283283
case `throws`
284-
case transferring
285284
case transpose
286285
case `true`
287286
case `try`
@@ -697,11 +696,6 @@ public enum Keyword: CaseIterable {
697696
return KeywordSpec("throw", isLexerClassified: true)
698697
case .throws:
699698
return KeywordSpec("throws", isLexerClassified: true)
700-
case .transferring:
701-
return KeywordSpec(
702-
"transferring",
703-
experimentalFeature: .transferringArgsAndResults
704-
)
705699
case .sending:
706700
return KeywordSpec(
707701
"sending",

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,6 @@ public let TYPE_NODES: [Node] = [
591591
.keyword(._const),
592592
.keyword(.borrowing),
593593
.keyword(.consuming),
594-
.keyword(.transferring),
595594
.keyword(._resultDependsOn),
596595
.keyword(.sending),
597596
]),

Sources/SwiftParser/Declarations.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension DeclarationModifier {
2323
.borrowing, .class, .consuming, .convenience, .distributed, .dynamic,
2424
.final, .indirect, .infix, .isolated, .lazy, .mutating, .nonmutating,
2525
.optional, .override, .postfix, .prefix, .reasync, ._resultDependsOn, ._resultDependsOnSelf, .required,
26-
.rethrows, .static, .weak, .transferring, .sending:
26+
.rethrows, .static, .weak, .sending:
2727
return false
2828
case .fileprivate, .internal, .nonisolated, .package, .open, .private,
2929
.public, .unowned:

Sources/SwiftParser/Patterns.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ extension Parser.Lookahead {
377377
&& !self.at(.keyword(.__owned))
378378
&& !self.at(.keyword(.borrowing))
379379
&& !self.at(.keyword(.consuming))
380-
&& !(experimentalFeatures.contains(.transferringArgsAndResults) && self.at(.keyword(.transferring)))
381380
&& !(experimentalFeatures.contains(.sendingArgsAndResults) && self.at(.keyword(.sending)))
382381
&& !(experimentalFeatures.contains(.nonescapableTypes) && self.at(.keyword(._resultDependsOn)))
383382
{

Sources/SwiftParser/TokenPrecedence.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ enum TokenPrecedence: Comparable {
237237
.__setter_access, .indirect, .isolated, .nonisolated, .distributed, ._local,
238238
.inout, ._mutating, ._borrow, ._borrowing, .borrowing, ._consuming, .consuming, .consume, ._resultDependsOnSelf,
239239
._resultDependsOn,
240-
.transferring, .dependsOn, .scoped, .sending,
240+
.dependsOn, .scoped, .sending,
241241
// Accessors
242242
.get, .set, .didSet, .willSet, .unsafeAddress, .addressWithOwner, .addressWithNativeOwner, .unsafeMutableAddress,
243243
.mutableAddressWithOwner, .mutableAddressWithNativeOwner, ._read, ._modify,

Sources/SwiftParser/TokenSpecSet.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ enum DeclarationModifier: TokenSpecSet {
379379
case `rethrows`
380380
case sending
381381
case `static`
382-
case transferring
383382
case unowned
384383
case weak
385384
case _resultDependsOn
@@ -420,7 +419,6 @@ enum DeclarationModifier: TokenSpecSet {
420419
case TokenSpec(.required): self = .required
421420
case TokenSpec(.rethrows): self = .rethrows
422421
case TokenSpec(.static): self = .static
423-
case TokenSpec(.transferring): self = .transferring
424422
case TokenSpec(.sending): self = .sending
425423
case TokenSpec(.unowned): self = .unowned
426424
case TokenSpec(.weak): self = .weak
@@ -466,7 +464,6 @@ enum DeclarationModifier: TokenSpecSet {
466464
case .required: return .keyword(.required)
467465
case .rethrows: return TokenSpec(.rethrows, recoveryPrecedence: .declKeyword)
468466
case .static: return .keyword(.static)
469-
case .transferring: return .keyword(.transferring)
470467
case .sending: return .keyword(.sending)
471468
case .unowned: return TokenSpec(.unowned, recoveryPrecedence: .declKeyword)
472469
case .weak: return TokenSpec(.weak, recoveryPrecedence: .declKeyword)

Tests/SwiftParserTest/DeclarationTests.swift

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3294,21 +3294,6 @@ final class DeclarationTests: ParserTestCase {
32943294
assertParse("public init() -> Int")
32953295
}
32963296

3297-
func testTransferringTypeSpecifier() {
3298-
assertParse(
3299-
"func testVarDeclTupleElt() -> (transferring String, String) {}",
3300-
experimentalFeatures: .transferringArgsAndResults
3301-
)
3302-
assertParse(
3303-
"func testVarDeclTuple2(_ x: (transferring String)) {}",
3304-
experimentalFeatures: .transferringArgsAndResults
3305-
)
3306-
assertParse(
3307-
"func testVarDeclTuple2(_ x: (transferring String, String)) {}",
3308-
experimentalFeatures: .transferringArgsAndResults
3309-
)
3310-
}
3311-
33123297
func testSendingTypeSpecifier() {
33133298
assertParse(
33143299
"func testVarDeclTupleElt() -> (sending String, String) {}",

Tests/SwiftParserTest/TransferringTest.swift renamed to Tests/SwiftParserTest/SendingTest.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
@_spi(ExperimentalLanguageFeatures) import SwiftParser
1414
import XCTest
1515

16-
final class TransferringTests: ParserTestCase {
17-
func testTransferingArg1() {
16+
final class SendingTests: ParserTestCase {
17+
func testSendingArg1() {
1818
assertParse(
1919
"""
2020
class Klass {}
21-
func transferMain(_ x: transferring Klass) -> ()
21+
func transferMain(_ x: sending Klass) -> ()
2222
""",
23-
experimentalFeatures: .transferringArgsAndResults
23+
experimentalFeatures: .sendingArgsAndResults
2424
)
2525
}
2626

27-
func testTransferingArgMiddle() {
27+
func testSendingArgMiddle() {
2828
assertParse(
2929
"""
3030
class Klass {}
31-
func transferMain(_ y: Klass, _ x: transferring Klass, _ z: Klass) -> ()
31+
func transferMain(_ y: Klass, _ x: sending Klass, _ z: Klass) -> ()
3232
""",
33-
experimentalFeatures: .transferringArgsAndResults
33+
experimentalFeatures: .sendingArgsAndResults
3434
)
3535
}
3636
}

0 commit comments

Comments
 (0)