Merge pull request #41591 from kavon/or-actor

update diagnostic since actors can have deinits

Author: swift-ci

include/swift/AST/DiagnosticsParse.def

@@ -424,7 +424,7 @@ ERROR(initializer_has_name,PointsToFirstBadToken,
 
 // Destructor
 ERROR(destructor_decl_outside_class,none,
-      "deinitializers may only be declared within a class", ())
+      "deinitializers may only be declared within a class or actor", ())
 ERROR(expected_lbrace_destructor,PointsToFirstBadToken,
       "expected '{' for deinitializer", ())
 ERROR(destructor_has_name,PointsToFirstBadToken,

test/Parse/init_deinit.swift

@@ -26,7 +26,7 @@ struct FooStructDeinitializerB {
 }
 
 struct FooStructDeinitializerC {
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 class FooClassDeinitializerA {
@@ -45,30 +45,30 @@ init {} // expected-error {{initializers may only be declared within a type}} ex
 init() // expected-error {{initializers may only be declared within a type}}
 init() {} // expected-error {{initializers may only be declared within a type}}
 
-deinit {} // expected-error {{deinitializers may only be declared within a class}}
+deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 deinit // expected-error {{expected '{' for deinitializer}}
-deinit {} // expected-error {{deinitializers may only be declared within a class}}
+deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 
 struct BarStruct {
   init() {}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 extension BarStruct {
   init(x : Int) {}
 
   // When/if we allow 'var' in extensions, then we should also allow dtors
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 enum BarUnion {
   init() {}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 extension BarUnion {
   init(x : Int) {}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 class BarClass {
@@ -78,22 +78,22 @@ class BarClass {
 
 extension BarClass {
   convenience init(x : Int) { self.init() }
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 protocol BarProtocol {
   init() {} // expected-error {{protocol initializers must not have bodies}}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 extension BarProtocol {
   init(x : Int) {}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 func fooFunc() {
   init() {} // expected-error {{initializers may only be declared within a type}}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 func barFunc() {
@@ -105,7 +105,7 @@ func barFunc() {
 
   var y : () = { () -> () in
     // expected-warning@-1 {{variable 'y' was never used; consider replacing with '_' or removing it}}
-    deinit {} // expected-error {{deinitializers may only be declared within a class}}
+    deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
     return
   } ()
 }

test/SIL/parse_swift_decls_in_sil_mode.sil

@@ -2,7 +2,7 @@
 
 typealias Int = ()
 
-deinit // expected-error {{deinitializers may only be declared within a class}}
+deinit // expected-error {{deinitializers may only be declared within a class or actor}}
 
 subscript (x : Int, y : Int) -> Int { get }// expected-error{{'subscript' functions may only be declared within a type}}
 

test/Serialization/AllowErrors/invalid-deinit.swift

@@ -12,7 +12,7 @@
 struct Foo {}
 
 @discardableResult // expected-error{{'@discardableResult' attribute cannot be applied to this declaration}}
-deinit {} // expected-error{{deinitializers may only be declared within a class}}
+deinit {} // expected-error{{deinitializers may only be declared within a class or actor}}
 
 func foo() -> Foo { return Foo() }
 

test/SourceKit/DocumentStructure/structure.swift.empty.response

@@ -1722,7 +1722,7 @@
       key.column: 1,
       key.severity: source.diagnostic.severity.error,
       key.id: "destructor_decl_outside_class",
-      key.description: "deinitializers may only be declared within a class",
+      key.description: "deinitializers may only be declared within a class or actor",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }
   ]

test/SourceKit/DocumentStructure/structure.swift.foobar.response

@@ -1727,7 +1727,7 @@
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
       key.id: "destructor_decl_outside_class",
-      key.description: "deinitializers may only be declared within a class",
+      key.description: "deinitializers may only be declared within a class or actor",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }
   ]

test/SourceKit/DocumentStructure/structure.swift.response

@@ -1727,7 +1727,7 @@
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
       key.id: "destructor_decl_outside_class",
-      key.description: "deinitializers may only be declared within a class",
+      key.description: "deinitializers may only be declared within a class or actor",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse
     }
   ]

test/decl/ext/extensions.swift

@@ -10,7 +10,7 @@ extension extension_for_invalid_type_3 { // expected-error {{cannot find type 'e
   init() {}
 }
 extension extension_for_invalid_type_4 { // expected-error {{cannot find type 'extension_for_invalid_type_4' in scope}}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 extension extension_for_invalid_type_5 { // expected-error {{cannot find type 'extension_for_invalid_type_5' in scope}}
   typealias X = Int

test/decl/protocol/protocols.swift

@@ -3,7 +3,7 @@ protocol EmptyProtocol { }
 
 protocol DefinitionsInProtocols {
   init() {} // expected-error {{protocol initializers must not have bodies}}
-  deinit {} // expected-error {{deinitializers may only be declared within a class}}
+  deinit {} // expected-error {{deinitializers may only be declared within a class or actor}}
 }
 
 // Protocol decl.