Skip to content

Commit ec9132c

Browse files
committed
[Diagnostics] Tailor using diagnostic to current use-case - default isolation
1 parent 595c3b3 commit ec9132c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

include/swift/AST/DiagnosticsParse.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2191,8 +2191,8 @@ ERROR(nonisolated_nonsending_repeated,none,
21912191
// MARK: using @<attribute> or using <identifier>
21922192
//------------------------------------------------------------------------------
21932193
ERROR(using_decl_invalid_specifier,PointsToFirstBadToken,
2194-
"'using' declaration does not support %0 %select{modifier|attribute}1",
2195-
(Identifier, bool))
2194+
"default isolation can only be set to '@MainActor' or 'nonisolated'",
2195+
())
21962196
ERROR(experimental_using_decl_disabled,PointsToFirstBadToken,
21972197
"'using' is an experimental feature that is currently disabled", ())
21982198

lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6705,8 +6705,7 @@ ParserResult<UsingDecl> Parser::parseDeclUsing(ParseDeclOptions Flags,
67056705
.Default(std::nullopt);
67066706

67076707
if (!Specifier) {
6708-
diagnose(SpecifierLoc, diag::using_decl_invalid_specifier, RawSpecifier,
6709-
AtLoc.isValid());
6708+
diagnose(SpecifierLoc, diag::using_decl_invalid_specifier);
67106709
return nullptr;
67116710
}
67126711

test/Parse/using.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ using @MainActor
1010
using nonisolated
1111
// expected-error@-1 {{invalid redeclaration of file-level default actor isolation}}
1212

13-
using @Test // expected-error {{'using' declaration does not support 'Test' attribute}}
14-
using test // expected-error {{'using' declaration does not support 'test' modifier}}
13+
using @Test // expected-error {{default isolation can only be set to '@MainActor' or 'nonisolated'}}
14+
using test // expected-error {{default isolation can only be set to '@MainActor' or 'nonisolated'}}
1515

1616
do {
1717
using // expected-warning {{expression of type 'Int' is unused}}

0 commit comments

Comments
 (0)