Skip to content

Commit d572c75

Browse files
committed
NFC: Remove 'actor class' from diagnostics
1 parent 42b6918 commit d572c75

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4323,7 +4323,7 @@ ERROR(async_objc_dynamic_self,none,
43234323
"asynchronous method returning 'Self' cannot be '@objc'", ())
43244324

43254325
ERROR(actor_with_nonactor_superclass,none,
4326-
"actor class cannot inherit from non-actor class %0", (DeclName))
4326+
"actor cannot inherit from non-actor class %0", (DeclName))
43274327

43284328
ERROR(actor_isolated_non_self_reference,none,
43294329
"actor-isolated %0 %1 can only be %select{referenced|mutated|used 'inout'}3 "
@@ -4500,7 +4500,7 @@ ERROR(multiple_global_actors,none,
45004500
ERROR(global_actor_disallowed,none,
45014501
"%0 cannot have a global actor", (DescriptiveDeclKind))
45024502
ERROR(global_actor_on_actor_class,none,
4503-
"actor class %0 cannot have a global actor", (Identifier))
4503+
"actor %0 cannot have a global actor", (Identifier))
45044504
ERROR(global_actor_on_local_variable,none,
45054505
"local variable %0 cannot have a global actor", (DeclName))
45064506
ERROR(global_actor_non_unsafe_init,none,

test/attr/global_actor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class SomeClass {
8383

8484
@GA1 typealias Integer = Int // expected-error{{type alias cannot have a global actor}}
8585

86-
@GA1 actor ActorInTooManyPlaces { } // expected-error{{actor class 'ActorInTooManyPlaces' cannot have a global actor}}
86+
@GA1 actor ActorInTooManyPlaces { } // expected-error{{actor 'ActorInTooManyPlaces' cannot have a global actor}}
8787

8888
@GA1 @OtherGlobalActor func twoGlobalActors() { } // expected-error{{declaration can not have multiple global actor attributes ('OtherGlobalActor' and 'GA1')}}
8989

test/decl/class/actor/basic.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ actor class MyActorClass { }
1313

1414
class NonActor { }
1515

16-
actor NonActorSubclass : NonActor { } // expected-error{{actor class cannot inherit from non-actor class 'NonActor'}}
16+
actor NonActorSubclass : NonActor { } // expected-error{{actor cannot inherit from non-actor class 'NonActor'}}
1717

1818
// expected-warning@+1{{'actor class' has been renamed to 'actor'}}{{14-20=}}
1919
public actor class BobHope {}

0 commit comments

Comments
 (0)