Skip to content

Commit 94c4b98

Browse files
gottesmmgottesmm
authored
Merge pull request #2692 from gottesmm/rdar130253724
[sending] Get rid of transferring
2 parents 7de7276 + 7c11a7c commit 94c4b98

File tree

16 files changed

+13
-81
lines changed

16 files changed

+13
-81
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,6 @@ public let DECL_NODES: [Node] = [
468468
.keyword(.reasync),
469469
.keyword(.required),
470470
.keyword(.static),
471-
.keyword(.transferring),
472471
.keyword(.unowned),
473472
.keyword(.weak),
474473
.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 trailingComma
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 .trailingComma:
3835
return "trailing comma"
3936
case .sendingArgsAndResults:

‎CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ public enum Keyword: CaseIterable {
279279
case then
280280
case `throw`
281281
case `throws`
282-
case transferring
283282
case transpose
284283
case `true`
285284
case `try`
@@ -691,11 +690,6 @@ public enum Keyword: CaseIterable {
691690
return KeywordSpec("throw", isLexerClassified: true)
692691
case .throws:
693692
return KeywordSpec("throws", isLexerClassified: true)
694-
case .transferring:
695-
return KeywordSpec(
696-
"transferring",
697-
experimentalFeature: .transferringArgsAndResults
698-
)
699693
case .sending:
700694
return KeywordSpec(
701695
"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(.sending),
596595
]),
597596
documentation: "The specifier token that's attached to the type."

‎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, .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
{
383382
return true

‎Sources/SwiftParser/TokenPrecedence.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ enum TokenPrecedence: Comparable {
236236
.convenience, .override, .package, .open,
237237
.__setter_access, .indirect, .isolated, .nonisolated, .distributed, ._local,
238238
.inout, ._mutating, ._borrow, ._borrowing, .borrowing, ._consuming, .consuming, .consume,
239-
.transferring, .dependsOn, .scoped, .sending,
239+
.dependsOn, .scoped, .sending,
240240
// Accessors
241241
.get, .set, .didSet, .willSet, .unsafeAddress, .addressWithOwner, .addressWithNativeOwner, .unsafeMutableAddress,
242242
.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

@@ -418,7 +417,6 @@ enum DeclarationModifier: TokenSpecSet {
418417
case TokenSpec(.required): self = .required
419418
case TokenSpec(.rethrows): self = .rethrows
420419
case TokenSpec(.static): self = .static
421-
case TokenSpec(.transferring): self = .transferring
422420
case TokenSpec(.sending): self = .sending
423421
case TokenSpec(.unowned): self = .unowned
424422
case TokenSpec(.weak): self = .weak
@@ -461,7 +459,6 @@ enum DeclarationModifier: TokenSpecSet {
461459
case .required: return .keyword(.required)
462460
case .rethrows: return TokenSpec(.rethrows, recoveryPrecedence: .declKeyword)
463461
case .static: return .keyword(.static)
464-
case .transferring: return .keyword(.transferring)
465462
case .sending: return .keyword(.sending)
466463
case .unowned: return TokenSpec(.unowned, recoveryPrecedence: .declKeyword)
467464
case .weak: return TokenSpec(.weak, recoveryPrecedence: .declKeyword)

‎Sources/SwiftParser/generated/ExperimentalFeatures.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@ extension Parser.ExperimentalFeatures {
3636
/// Whether to enable the parsing of NonEscableTypes.
3737
public static let nonescapableTypes = Self (rawValue: 1 << 3)
3838

39-
/// Whether to enable the parsing of TransferringArgsAndResults.
40-
public static let transferringArgsAndResults = Self (rawValue: 1 << 4)
41-
4239
/// Whether to enable the parsing of trailing comma.
43-
public static let trailingComma = Self (rawValue: 1 << 5)
40+
public static let trailingComma = Self (rawValue: 1 << 4)
4441

4542
/// Whether to enable the parsing of SendingArgsAndResults.
46-
public static let sendingArgsAndResults = Self (rawValue: 1 << 6)
43+
public static let sendingArgsAndResults = Self (rawValue: 1 << 5)
4744
}

‎Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -804,10 +804,6 @@ extension DeclModifierSyntax {
804804
case reasync
805805
case required
806806
case `static`
807-
#if compiler(>=5.8)
808-
@_spi(ExperimentalLanguageFeatures)
809-
#endif
810-
case transferring
811807
case unowned
812808
case weak
813809
#if compiler(>=5.8)
@@ -883,8 +879,6 @@ extension DeclModifierSyntax {
883879
self = .required
884880
case TokenSpec(.static):
885881
self = .static
886-
case TokenSpec(.transferring) where experimentalFeatures.contains(.transferringArgsAndResults):
887-
self = .transferring
888882
case TokenSpec(.unowned):
889883
self = .unowned
890884
case TokenSpec(.weak):
@@ -964,8 +958,6 @@ extension DeclModifierSyntax {
964958
self = .required
965959
case TokenSpec(.static):
966960
self = .static
967-
case TokenSpec(.transferring):
968-
self = .transferring
969961
case TokenSpec(.unowned):
970962
self = .unowned
971963
case TokenSpec(.weak):
@@ -1045,8 +1037,6 @@ extension DeclModifierSyntax {
10451037
return .keyword(.required)
10461038
case .static:
10471039
return .keyword(.static)
1048-
case .transferring:
1049-
return .keyword(.transferring)
10501040
case .unowned:
10511041
return .keyword(.unowned)
10521042
case .weak:
@@ -1128,8 +1118,6 @@ extension DeclModifierSyntax {
11281118
return .keyword(.required)
11291119
case .static:
11301120
return .keyword(.static)
1131-
case .transferring:
1132-
return .keyword(.transferring)
11331121
case .unowned:
11341122
return .keyword(.unowned)
11351123
case .weak:
@@ -3342,10 +3330,6 @@ extension SimpleTypeSpecifierSyntax {
33423330
#if compiler(>=5.8)
33433331
@_spi(ExperimentalLanguageFeatures)
33443332
#endif
3345-
case transferring
3346-
#if compiler(>=5.8)
3347-
@_spi(ExperimentalLanguageFeatures)
3348-
#endif
33493333
case sending
33503334

33513335
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
@@ -3364,8 +3348,6 @@ extension SimpleTypeSpecifierSyntax {
33643348
self = .borrowing
33653349
case TokenSpec(.consuming):
33663350
self = .consuming
3367-
case TokenSpec(.transferring) where experimentalFeatures.contains(.transferringArgsAndResults):
3368-
self = .transferring
33693351
case TokenSpec(.sending) where experimentalFeatures.contains(.sendingArgsAndResults):
33703352
self = .sending
33713353
default:
@@ -3389,8 +3371,6 @@ extension SimpleTypeSpecifierSyntax {
33893371
self = .borrowing
33903372
case TokenSpec(.consuming):
33913373
self = .consuming
3392-
case TokenSpec(.transferring):
3393-
self = .transferring
33943374
case TokenSpec(.sending):
33953375
self = .sending
33963376
default:
@@ -3414,8 +3394,6 @@ extension SimpleTypeSpecifierSyntax {
34143394
return .keyword(.borrowing)
34153395
case .consuming:
34163396
return .keyword(.consuming)
3417-
case .transferring:
3418-
return .keyword(.transferring)
34193397
case .sending:
34203398
return .keyword(.sending)
34213399
}
@@ -3441,8 +3419,6 @@ extension SimpleTypeSpecifierSyntax {
34413419
return .keyword(.borrowing)
34423420
case .consuming:
34433421
return .keyword(.consuming)
3444-
case .transferring:
3445-
return .keyword(.transferring)
34463422
case .sending:
34473423
return .keyword(.sending)
34483424
}

0 commit comments

Comments
 (0)