Merge pull request #37267 from kaar3k/main

Author: swift-ci

include/swift/AST/DiagnosticsSema.def

@@ -3477,7 +3477,7 @@ ERROR(cfclass_designated_init_in_extension,none,
       "designated initializer cannot be declared in an extension of %0",
       (DeclName))
 ERROR(enumstruct_convenience_init,none,
-      "delegating initializers in %0 are not marked with 'convenience'",
+      "initializers in %0 are not marked with 'convenience'",
       (StringRef))
 ERROR(nonclass_convenience_init,none,
       "convenience initializer not allowed in non-class type %0",

test/decl/func/complete_object_init.swift

@@ -40,7 +40,7 @@ class DerivesA : A {
 }
 
 struct S {
-  convenience init(int i: Int) { // expected-error{{delegating initializers in structs are not marked with 'convenience'}}
+  convenience init(int i: Int) { // expected-error{{initializers in structs are not marked with 'convenience'}}
     self.init(double: Double(i))
   }  
 

test/decl/init/basic_init.swift

@@ -44,7 +44,7 @@ extension InitStruct {
 struct MyStruct {
   init(k: Int) {
   }
-  convenience init() {  // expected-error {{delegating initializers in structs are not marked with 'convenience'}} {{3-15=}}
+  convenience init() {  // expected-error {{initializers in structs are not marked with 'convenience'}} {{3-15=}}
     self.init(k: 1)
   }
 }