Skip to content

Commit 4d300ac

Browse files
meg-guptameg-gupta
authored
Merge pull request #2670 from meg-gupta/deleteresultdependson
Remove resultDependsOn/resultDependsOnSelf
2 parents 56209b4 + ac75cab commit 4d300ac

File tree

14 files changed

+5
-111
lines changed

14 files changed

+5
-111
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ public let DECL_NODES: [Node] = [
466466
.keyword(.private),
467467
.keyword(.public),
468468
.keyword(.reasync),
469-
.keyword(._resultDependsOnSelf),
470469
.keyword(.required),
471470
.keyword(.static),
472471
.keyword(.transferring),

‎CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ public enum Keyword: CaseIterable {
253253
case renamed
254254
case `repeat`
255255
case required
256-
case _resultDependsOn
257-
case _resultDependsOnSelf
258256
case `rethrows`
259257
case retroactive
260258
case `return`
@@ -643,10 +641,6 @@ public enum Keyword: CaseIterable {
643641
return KeywordSpec("repeat", isLexerClassified: true)
644642
case .required:
645643
return KeywordSpec("required")
646-
case ._resultDependsOn:
647-
return KeywordSpec("_resultDependsOn", experimentalFeature: .nonescapableTypes)
648-
case ._resultDependsOnSelf:
649-
return KeywordSpec("_resultDependsOnSelf", experimentalFeature: .nonescapableTypes)
650644
case .rethrows:
651645
return KeywordSpec("rethrows", isLexerClassified: true)
652646
case .retroactive:

‎CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ public let TYPE_NODES: [Node] = [
592592
.keyword(.borrowing),
593593
.keyword(.consuming),
594594
.keyword(.transferring),
595-
.keyword(._resultDependsOn),
596595
.keyword(.sending),
597596
]),
598597
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
@@ -22,7 +22,7 @@ extension DeclarationModifier {
2222
case .__consuming, .__setter_access, ._const, ._local, .async,
2323
.borrowing, .class, .consuming, .convenience, .distributed, .dynamic,
2424
.final, .indirect, .infix, .isolated, .lazy, .mutating, .nonmutating,
25-
.optional, .override, .postfix, .prefix, .reasync, ._resultDependsOn, ._resultDependsOnSelf, .required,
25+
.optional, .override, .postfix, .prefix, .reasync, .required,
2626
.rethrows, .static, .weak, .transferring, .sending:
2727
return false
2828
case .fileprivate, .internal, .nonisolated, .package, .open, .private,

‎Sources/SwiftParser/Modifiers.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ extension Parser {
8989
(.declarationModifier(._const), let handle)?,
9090
(.declarationModifier(._local), let handle)?,
9191
(.declarationModifier(.__setter_access), let handle)?,
92-
(.declarationModifier(.reasync), let handle)?,
93-
(.declarationModifier(._resultDependsOnSelf), let handle)?
92+
(.declarationModifier(.reasync), let handle)?
9493
where experimentalFeatures.contains(.nonescapableTypes):
9594
let (unexpectedBeforeKeyword, keyword) = self.eat(handle)
9695
elements.append(RawDeclModifierSyntax(unexpectedBeforeKeyword, name: keyword, detail: nil, arena: self.arena))

‎Sources/SwiftParser/Patterns.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ extension Parser.Lookahead {
379379
&& !self.at(.keyword(.consuming))
380380
&& !(experimentalFeatures.contains(.transferringArgsAndResults) && self.at(.keyword(.transferring)))
381381
&& !(experimentalFeatures.contains(.sendingArgsAndResults) && self.at(.keyword(.sending)))
382-
&& !(experimentalFeatures.contains(.nonescapableTypes) && self.at(.keyword(._resultDependsOn)))
383382
{
384383
return true
385384
}

‎Sources/SwiftParser/TokenPrecedence.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ enum TokenPrecedence: Comparable {
235235
.__consuming, .final, .required, .optional, .lazy, .dynamic, .infix, .postfix, .prefix, .mutating, .nonmutating,
236236
.convenience, .override, .package, .open,
237237
.__setter_access, .indirect, .isolated, .nonisolated, .distributed, ._local,
238-
.inout, ._mutating, ._borrow, ._borrowing, .borrowing, ._consuming, .consuming, .consume, ._resultDependsOnSelf,
239-
._resultDependsOn,
238+
.inout, ._mutating, ._borrow, ._borrowing, .borrowing, ._consuming, .consuming, .consume,
240239
.transferring, .dependsOn, .scoped, .sending,
241240
// Accessors
242241
.get, .set, .didSet, .willSet, .unsafeAddress, .addressWithOwner, .addressWithNativeOwner, .unsafeMutableAddress,

‎Sources/SwiftParser/TokenSpecSet.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,6 @@ enum DeclarationModifier: TokenSpecSet {
382382
case transferring
383383
case unowned
384384
case weak
385-
case _resultDependsOn
386-
case _resultDependsOnSelf
387385

388386
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
389387
switch PrepareForKeywordMatch(lexeme) {
@@ -424,9 +422,6 @@ enum DeclarationModifier: TokenSpecSet {
424422
case TokenSpec(.sending): self = .sending
425423
case TokenSpec(.unowned): self = .unowned
426424
case TokenSpec(.weak): self = .weak
427-
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonescapableTypes): self = ._resultDependsOn
428-
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonescapableTypes):
429-
self = ._resultDependsOnSelf
430425
default: return nil
431426
}
432427
}
@@ -470,8 +465,6 @@ enum DeclarationModifier: TokenSpecSet {
470465
case .sending: return .keyword(.sending)
471466
case .unowned: return TokenSpec(.unowned, recoveryPrecedence: .declKeyword)
472467
case .weak: return TokenSpec(.weak, recoveryPrecedence: .declKeyword)
473-
case ._resultDependsOn: return TokenSpec(._resultDependsOn, recoveryPrecedence: .declKeyword)
474-
case ._resultDependsOnSelf: return TokenSpec(._resultDependsOnSelf, recoveryPrecedence: .declKeyword)
475468
}
476469
}
477470
}

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -802,10 +802,6 @@ extension DeclModifierSyntax {
802802
case `private`
803803
case `public`
804804
case reasync
805-
#if compiler(>=5.8)
806-
@_spi(ExperimentalLanguageFeatures)
807-
#endif
808-
case _resultDependsOnSelf
809805
case required
810806
case `static`
811807
#if compiler(>=5.8)
@@ -883,8 +879,6 @@ extension DeclModifierSyntax {
883879
self = .public
884880
case TokenSpec(.reasync):
885881
self = .reasync
886-
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonescapableTypes):
887-
self = ._resultDependsOnSelf
888882
case TokenSpec(.required):
889883
self = .required
890884
case TokenSpec(.static):
@@ -966,8 +960,6 @@ extension DeclModifierSyntax {
966960
self = .public
967961
case TokenSpec(.reasync):
968962
self = .reasync
969-
case TokenSpec(._resultDependsOnSelf):
970-
self = ._resultDependsOnSelf
971963
case TokenSpec(.required):
972964
self = .required
973965
case TokenSpec(.static):
@@ -1049,8 +1041,6 @@ extension DeclModifierSyntax {
10491041
return .keyword(.public)
10501042
case .reasync:
10511043
return .keyword(.reasync)
1052-
case ._resultDependsOnSelf:
1053-
return .keyword(._resultDependsOnSelf)
10541044
case .required:
10551045
return .keyword(.required)
10561046
case .static:
@@ -1134,8 +1124,6 @@ extension DeclModifierSyntax {
11341124
return .keyword(.public)
11351125
case .reasync:
11361126
return .keyword(.reasync)
1137-
case ._resultDependsOnSelf:
1138-
return .keyword(._resultDependsOnSelf)
11391127
case .required:
11401128
return .keyword(.required)
11411129
case .static:
@@ -3358,10 +3346,6 @@ extension SimpleTypeSpecifierSyntax {
33583346
#if compiler(>=5.8)
33593347
@_spi(ExperimentalLanguageFeatures)
33603348
#endif
3361-
case _resultDependsOn
3362-
#if compiler(>=5.8)
3363-
@_spi(ExperimentalLanguageFeatures)
3364-
#endif
33653349
case sending
33663350

33673351
init?(lexeme: Lexer.Lexeme, experimentalFeatures: Parser.ExperimentalFeatures) {
@@ -3382,8 +3366,6 @@ extension SimpleTypeSpecifierSyntax {
33823366
self = .consuming
33833367
case TokenSpec(.transferring) where experimentalFeatures.contains(.transferringArgsAndResults):
33843368
self = .transferring
3385-
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonescapableTypes):
3386-
self = ._resultDependsOn
33873369
case TokenSpec(.sending) where experimentalFeatures.contains(.sendingArgsAndResults):
33883370
self = .sending
33893371
default:
@@ -3409,8 +3391,6 @@ extension SimpleTypeSpecifierSyntax {
34093391
self = .consuming
34103392
case TokenSpec(.transferring):
34113393
self = .transferring
3412-
case TokenSpec(._resultDependsOn):
3413-
self = ._resultDependsOn
34143394
case TokenSpec(.sending):
34153395
self = .sending
34163396
default:
@@ -3436,8 +3416,6 @@ extension SimpleTypeSpecifierSyntax {
34363416
return .keyword(.consuming)
34373417
case .transferring:
34383418
return .keyword(.transferring)
3439-
case ._resultDependsOn:
3440-
return .keyword(._resultDependsOn)
34413419
case .sending:
34423420
return .keyword(.sending)
34433421
}
@@ -3465,8 +3443,6 @@ extension SimpleTypeSpecifierSyntax {
34653443
return .keyword(.consuming)
34663444
case .transferring:
34673445
return .keyword(.transferring)
3468-
case ._resultDependsOn:
3469-
return .keyword(._resultDependsOn)
34703446
case .sending:
34713447
return .keyword(.sending)
34723448
}

‎Sources/SwiftSyntax/generated/Keyword.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
192192
case renamed
193193
case `repeat`
194194
case required
195-
#if compiler(>=5.8)
196-
@_spi(ExperimentalLanguageFeatures)
197-
#endif
198-
case _resultDependsOn
199-
#if compiler(>=5.8)
200-
@_spi(ExperimentalLanguageFeatures)
201-
#endif
202-
case _resultDependsOnSelf
203195
case `rethrows`
204196
case retroactive
205197
case `return`
@@ -733,8 +725,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
733725
self = ._objcRuntimeName
734726
case "addressWithOwner":
735727
self = .addressWithOwner
736-
case "_resultDependsOn":
737-
self = ._resultDependsOn
738728
default:
739729
return nil
740730
}
@@ -771,8 +761,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
771761
self = ._compilerInitialized
772762
case "_originallyDefinedIn":
773763
self = ._originallyDefinedIn
774-
case "_resultDependsOnSelf":
775-
self = ._resultDependsOnSelf
776764
case "unsafeMutableAddress":
777765
self = .unsafeMutableAddress
778766
default:
@@ -998,8 +986,6 @@ public enum Keyword: UInt8, Hashable, Sendable {
998986
"renamed",
999987
"repeat",
1000988
"required",
1001-
"_resultDependsOn",
1002-
"_resultDependsOnSelf",
1003989
"rethrows",
1004990
"retroactive",
1005991
"return",

‎Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
794794
.keyword("private"),
795795
.keyword("public"),
796796
.keyword("reasync"),
797-
.keyword("_resultDependsOnSelf"),
798797
.keyword("required"),
799798
.keyword("static"),
800799
.keyword("transferring"),
@@ -2299,7 +2298,6 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
22992298
.keyword("borrowing"),
23002299
.keyword("consuming"),
23012300
.keyword("transferring"),
2302-
.keyword("_resultDependsOn"),
23032301
.keyword("sending")
23042302
]))
23052303
assertNoError(kind, 2, verify(layout[2], as: RawUnexpectedNodesSyntax?.self))

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public struct DeclModifierDetailSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyn
169169

170170
/// ### Children
171171
///
172-
/// - `name`: (`__consuming` | `__setter_access` | `_const` | `_local` | `actor` | `async` | `borrowing` | `class` | `consuming` | `convenience` | `distributed` | `dynamic` | `fileprivate` | `final` | `indirect` | `infix` | `internal` | `isolated` | `lazy` | `mutating` | `nonisolated` | `nonmutating` | `open` | `optional` | `override` | `package` | `postfix` | `prefix` | `private` | `public` | `reasync` | `_resultDependsOnSelf` | `required` | `static` | `transferring` | `unowned` | `weak` | `sending`)
172+
/// - `name`: (`__consuming` | `__setter_access` | `_const` | `_local` | `actor` | `async` | `borrowing` | `class` | `consuming` | `convenience` | `distributed` | `dynamic` | `fileprivate` | `final` | `indirect` | `infix` | `internal` | `isolated` | `lazy` | `mutating` | `nonisolated` | `nonmutating` | `open` | `optional` | `override` | `package` | `postfix` | `prefix` | `private` | `public` | `reasync` | `required` | `static` | `transferring` | `unowned` | `weak` | `sending`)
173173
/// - `detail`: ``DeclModifierDetailSyntax``?
174174
///
175175
/// ### Contained in
@@ -270,7 +270,6 @@ public struct DeclModifierSyntax: SyntaxProtocol, SyntaxHashable, _LeafSyntaxNod
270270
/// - `private`
271271
/// - `public`
272272
/// - `reasync`
273-
/// - `_resultDependsOnSelf`
274273
/// - `required`
275274
/// - `static`
276275
/// - `transferring`

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ public struct SimpleStringLiteralExprSyntax: ExprSyntaxProtocol, SyntaxHashable,
10901090
///
10911091
/// ### Children
10921092
///
1093-
/// - `specifier`: (`inout` | `__shared` | `__owned` | `isolated` | `_const` | `borrowing` | `consuming` | `transferring` | `_resultDependsOn` | `sending`)
1093+
/// - `specifier`: (`inout` | `__shared` | `__owned` | `isolated` | `_const` | `borrowing` | `consuming` | `transferring` | `sending`)
10941094
///
10951095
/// ### Contained in
10961096
///
@@ -1155,7 +1155,6 @@ public struct SimpleTypeSpecifierSyntax: SyntaxProtocol, SyntaxHashable, _LeafSy
11551155
/// - `borrowing`
11561156
/// - `consuming`
11571157
/// - `transferring`
1158-
/// - `_resultDependsOn`
11591158
/// - `sending`
11601159
public var specifier: TokenSyntax {
11611160
get {

‎Tests/SwiftParserTest/DeclarationTests.swift

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3225,52 +3225,6 @@ final class DeclarationTests: ParserTestCase {
32253225
)
32263226
}
32273227

3228-
func testResultDependsOnSelf() {
3229-
assertParse(
3230-
"""
3231-
class MethodModifiers {
3232-
_resultDependsOnSelf func getDependentResult() -> Builtin.NativeObject {
3233-
return Builtin.unsafeCastToNativeObject(self)
3234-
}
3235-
}
3236-
""",
3237-
experimentalFeatures: .nonescapableTypes
3238-
)
3239-
3240-
assertParse(
3241-
"""
3242-
class MethodModifiers {
3243-
_resultDependsOnSelf func _resultDependsOnSelf() -> Builtin.NativeObject {
3244-
return Builtin.unsafeCastToNativeObject(self)
3245-
}
3246-
}
3247-
""",
3248-
experimentalFeatures: .nonescapableTypes
3249-
)
3250-
}
3251-
3252-
func testResultDependsOn() {
3253-
assertParse(
3254-
"""
3255-
class Klass {}
3256-
func testTypeSpecifier(x : _resultDependsOn Klass) -> Builtin.NativeObject {
3257-
return Builtin.unsafeCastToNativeObject(x)
3258-
}
3259-
""",
3260-
experimentalFeatures: .nonescapableTypes
3261-
)
3262-
3263-
assertParse(
3264-
"""
3265-
class Klass {}
3266-
func testMultipleTypeSpecifier(x : _resultDependsOn Klass, y : _resultDependsOn Klass) -> (Builtin.NativeObject, Builtin.NativeObject) {
3267-
return (Builtin.unsafeCastToNativeObject(x), Builtin.unsafeCastToNativeObject(x))
3268-
}
3269-
""",
3270-
experimentalFeatures: .nonescapableTypes
3271-
)
3272-
}
3273-
32743228
func testDeclarationEndingWithNewline() {
32753229
let inputs: [UInt: String] = [
32763230
#line: "var x = 0\n",

0 commit comments

Comments
 (0)