Skip to content

Commit e5501d4

Browse files
committed
[AST] NFC: Capitalize UsingSpecifier::nonisolated for consistency
(cherry picked from commit 21ec592)
1 parent 76886eb commit e5501d4

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

include/swift/AST/Decl.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,13 @@ static_assert(uint8_t(SelfAccessKind::LastSelfAccessKind) <
270270

271271
enum class UsingSpecifier : uint8_t {
272272
MainActor,
273-
nonisolated,
274-
LastSpecifier = nonisolated,
273+
Nonisolated,
274+
LastSpecifier = Nonisolated,
275275
};
276276
enum : unsigned {
277277
NumUsingSpecifierBits =
278278
countBitsUsed(static_cast<unsigned>(UsingSpecifier::LastSpecifier))
279279
};
280-
static_assert(uint8_t(UsingSpecifier::LastSpecifier) <
281-
(NumUsingSpecifierBits << 1),
282-
"UsingSpecifier is too small to fit in UsingDecl specifier bits. "
283-
"Please expand ");
284280

285281
/// Diagnostic printing of \c SelfAccessKind.
286282
llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SelfAccessKind SAK);

lib/AST/Decl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ std::string UsingDecl::getSpecifierName() const {
18501850
switch (getSpecifier()) {
18511851
case UsingSpecifier::MainActor:
18521852
return "@MainActor";
1853-
case UsingSpecifier::nonisolated:
1853+
case UsingSpecifier::Nonisolated:
18541854
return "nonisolated";
18551855
}
18561856
}

lib/IDE/CompletionLookup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ void CompletionLookup::addUsingSpecifiers() {
397397
case UsingSpecifier::MainActor:
398398
Builder.addTextChunk("@MainActor");
399399
break;
400-
case UsingSpecifier::nonisolated:
400+
case UsingSpecifier::Nonisolated:
401401
Builder.addTextChunk("nonisolated");
402402
break;
403403
}

lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6676,7 +6676,7 @@ ParserResult<UsingDecl> Parser::parseDeclUsing(ParseDeclOptions Flags,
66766676
std::optional<UsingSpecifier> Specifier =
66776677
llvm::StringSwitch<std::optional<UsingSpecifier>>(RawSpecifier.str())
66786678
.Case("MainActor", UsingSpecifier::MainActor)
6679-
.Case("nonisolated", UsingSpecifier::nonisolated)
6679+
.Case("nonisolated", UsingSpecifier::Nonisolated)
66806680
.Default(std::nullopt);
66816681

66826682
if (!Specifier) {

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6495,7 +6495,7 @@ DefaultIsolationInSourceFileRequest::evaluate(Evaluator &evaluator,
64956495
case UsingSpecifier::MainActor:
64966496
setIsolation(D, DefaultIsolation::MainActor);
64976497
break;
6498-
case UsingSpecifier::nonisolated:
6498+
case UsingSpecifier::Nonisolated:
64996499
setIsolation(D, DefaultIsolation::Nonisolated);
65006500
break;
65016501
}

0 commit comments

Comments
 (0)