Skip to content

Commit 21ec592

Browse files
committed
[AST] NFC: Capitalize UsingSpecifier::nonisolated for consistency
1 parent ec9132c commit 21ec592

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
@@ -1854,7 +1854,7 @@ std::string UsingDecl::getSpecifierName() const {
18541854
switch (getSpecifier()) {
18551855
case UsingSpecifier::MainActor:
18561856
return "@MainActor";
1857-
case UsingSpecifier::nonisolated:
1857+
case UsingSpecifier::Nonisolated:
18581858
return "nonisolated";
18591859
}
18601860
}

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
@@ -6701,7 +6701,7 @@ ParserResult<UsingDecl> Parser::parseDeclUsing(ParseDeclOptions Flags,
67016701
std::optional<UsingSpecifier> Specifier =
67026702
llvm::StringSwitch<std::optional<UsingSpecifier>>(RawSpecifier.str())
67036703
.Case("MainActor", UsingSpecifier::MainActor)
6704-
.Case("nonisolated", UsingSpecifier::nonisolated)
6704+
.Case("nonisolated", UsingSpecifier::Nonisolated)
67056705
.Default(std::nullopt);
67066706

67076707
if (!Specifier) {

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6489,7 +6489,7 @@ DefaultIsolationInSourceFileRequest::evaluate(Evaluator &evaluator,
64896489
case UsingSpecifier::MainActor:
64906490
setIsolation(D, DefaultIsolation::MainActor);
64916491
break;
6492-
case UsingSpecifier::nonisolated:
6492+
case UsingSpecifier::Nonisolated:
64936493
setIsolation(D, DefaultIsolation::Nonisolated);
64946494
break;
64956495
}

0 commit comments

Comments
 (0)