Skip to content

Commit a889563

Browse files
committed
Rename NonesapableTypes feature
Follow the feature flag convention for capitalization and be consistent with the related NoncopyableGenerics feature. Corresponding swift commit 2a7c21f33be88ebb0329a9f1d7ee9a1b36c7e8ff
1 parent 3c45445 commit a889563

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public enum ExperimentalFeature: String, CaseIterable {
1717
case thenStatements
1818
case typedThrows
1919
case doExpressions
20-
case nonEscapableTypes
20+
case nonescapableTypes
2121
case globalConcurrency
2222

2323
/// The name of the feature, which is used in the doc comment.
@@ -31,7 +31,7 @@ public enum ExperimentalFeature: String, CaseIterable {
3131
return "typed throws"
3232
case .doExpressions:
3333
return "'do' expressions"
34-
case .nonEscapableTypes:
34+
case .nonescapableTypes:
3535
return "NonEscableTypes"
3636
case .globalConcurrency:
3737
return "strict concurrency for globals"

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,9 @@ public enum Keyword: CaseIterable {
619619
case .required:
620620
return KeywordSpec("required")
621621
case ._resultDependsOn:
622-
return KeywordSpec("_resultDependsOn", experimentalFeature: .nonEscapableTypes)
622+
return KeywordSpec("_resultDependsOn", experimentalFeature: .nonescapableTypes)
623623
case ._resultDependsOnSelf:
624-
return KeywordSpec("_resultDependsOnSelf", experimentalFeature: .nonEscapableTypes)
624+
return KeywordSpec("_resultDependsOnSelf", experimentalFeature: .nonescapableTypes)
625625
case .rethrows:
626626
return KeywordSpec("rethrows", isLexerClassified: true)
627627
case .retroactive:

Sources/SwiftParser/Modifiers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ extension Parser {
9191
(.declarationModifier(._local), let handle)?,
9292
(.declarationModifier(.__setter_access), let handle)?,
9393
(.declarationModifier(.reasync), let handle)?,
94-
(.declarationModifier(._resultDependsOnSelf), let handle)? where experimentalFeatures.contains(.nonEscapableTypes):
94+
(.declarationModifier(._resultDependsOnSelf), let handle)? where experimentalFeatures.contains(.nonescapableTypes):
9595
let (unexpectedBeforeKeyword, keyword) = self.eat(handle)
9696
elements.append(RawDeclModifierSyntax(unexpectedBeforeKeyword, name: keyword, detail: nil, arena: self.arena))
9797
case (.declarationModifier(.rethrows), _)?:

Sources/SwiftParser/Patterns.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ extension Parser.Lookahead {
353353
&& !self.at(.keyword(.__owned))
354354
&& !self.at(.keyword(.borrowing))
355355
&& !self.at(.keyword(.consuming))
356-
&& !(experimentalFeatures.contains(.nonEscapableTypes) && self.at(.keyword(._resultDependsOn)))
356+
&& !(experimentalFeatures.contains(.nonescapableTypes) && self.at(.keyword(._resultDependsOn)))
357357
{
358358
return true
359359
}

Sources/SwiftParser/TokenSpecSet.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ enum DeclarationModifier: TokenSpecSet {
416416
case TokenSpec(.static): self = .static
417417
case TokenSpec(.unowned): self = .unowned
418418
case TokenSpec(.weak): self = .weak
419-
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonEscapableTypes): self = ._resultDependsOn
420-
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonEscapableTypes): self = ._resultDependsOnSelf
419+
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonescapableTypes): self = ._resultDependsOn
420+
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonescapableTypes): self = ._resultDependsOnSelf
421421
default: return nil
422422
}
423423
}

Sources/SwiftParser/generated/ExperimentalFeatures.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extension Parser.ExperimentalFeatures {
3737
public static let doExpressions = Self (rawValue: 1 << 3)
3838

3939
/// Whether to enable the parsing of NonEscableTypes.
40-
public static let nonEscapableTypes = Self (rawValue: 1 << 4)
40+
public static let nonescapableTypes = Self (rawValue: 1 << 4)
4141

4242
/// Whether to enable the parsing of strict concurrency for globals.
4343
public static let globalConcurrency = Self (rawValue: 1 << 5)

Sources/SwiftParser/generated/Parser+TokenSpecSet.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ extension AttributedTypeSyntax {
202202
self = .borrowing
203203
case TokenSpec(.consuming):
204204
self = .consuming
205-
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonEscapableTypes):
205+
case TokenSpec(._resultDependsOn) where experimentalFeatures.contains(.nonescapableTypes):
206206
self = ._resultDependsOn
207207
default:
208208
return nil
@@ -793,7 +793,7 @@ extension DeclModifierSyntax {
793793
self = .public
794794
case TokenSpec(.reasync):
795795
self = .reasync
796-
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonEscapableTypes):
796+
case TokenSpec(._resultDependsOnSelf) where experimentalFeatures.contains(.nonescapableTypes):
797797
self = ._resultDependsOnSelf
798798
case TokenSpec(.required):
799799
self = .required

Tests/SwiftParserTest/DeclarationTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3106,7 +3106,7 @@ final class DeclarationTests: ParserTestCase {
31063106
}
31073107
}
31083108
""",
3109-
experimentalFeatures: .nonEscapableTypes
3109+
experimentalFeatures: .nonescapableTypes
31103110
)
31113111

31123112
assertParse(
@@ -3117,7 +3117,7 @@ final class DeclarationTests: ParserTestCase {
31173117
}
31183118
}
31193119
""",
3120-
experimentalFeatures: .nonEscapableTypes
3120+
experimentalFeatures: .nonescapableTypes
31213121
)
31223122
}
31233123

@@ -3129,7 +3129,7 @@ final class DeclarationTests: ParserTestCase {
31293129
return Builtin.unsafeCastToNativeObject(x)
31303130
}
31313131
""",
3132-
experimentalFeatures: .nonEscapableTypes
3132+
experimentalFeatures: .nonescapableTypes
31333133
)
31343134

31353135
assertParse(
@@ -3139,7 +3139,7 @@ final class DeclarationTests: ParserTestCase {
31393139
return (Builtin.unsafeCastToNativeObject(x), Builtin.unsafeCastToNativeObject(x))
31403140
}
31413141
""",
3142-
experimentalFeatures: .nonEscapableTypes
3142+
experimentalFeatures: .nonescapableTypes
31433143
)
31443144
}
31453145
}

0 commit comments

Comments
 (0)