update existing regression tests after small diagnostics refactor

new phrasing in the error messages to match up with
other phrasing used in messages.

Author: kavon

test/IDE/complete_asyncannotation.swift

@@ -65,9 +65,9 @@ func testMemberAsyncRethrows(_ x: HasAsyncMembers) async {
 func testAsyncIntiializers() async {
   HasAsyncMembers(#^CHECK_initializers^#
 // CHECK_initializers: Begin completions
-// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal: ['('][')'][#HasAsyncMembers#]; name=
-// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal: ['(']{#withAsync: Int#}[')'][#HasAsyncMembers#]; name=withAsync: Int
-// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal: ['(']{#withAsyncThrows: Int#}[')'][' throws'][#HasAsyncMembers#]; name=withAsyncThrows: Int throws
-// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal: ['(']{#withAsyncRethrows: () async throws -> Void##() async throws -> Void#}[')'][' rethrows'][#HasAsyncMembers#]; name=withAsyncRethrows: () async throws -> Void rethrows
+// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal:      ['('][')'][' async'][#HasAsyncMembers#]; name= async
+// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal:      ['(']{#withAsync: Int#}[')'][' async'][#HasAsyncMembers#]; name=withAsync: Int async
+// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal:      ['(']{#withAsyncThrows: Int#}[')'][' async'][' throws'][#HasAsyncMembers#]; name=withAsyncThrows: Int async throws
+// CHECK_initializers-DAG: Decl[Constructor]/CurrNominal:      ['(']{#withAsyncRethrows: () async throws -> Void##() async throws -> Void#}[')'][' async'][' rethrows'][#HasAsyncMembers#]; name=withAsyncRethrows: () async throws -> Void async rethrows
 // CHECK_initializers: End completions
 }

test/decl/class/effectful_properties.swift

@@ -36,7 +36,7 @@ class Presidio : GolfCourse {
     set { yardsFromBackTees = newValue }
   }
 
-  override var holes : Int {  // expected-error {{cannot override non-'async' property with 'async' property}}
+  override var holes : Int {  // expected-error {{cannot override non-async property with async property}}
     get async { 18 }
   }
 
@@ -50,11 +50,11 @@ class Presidio : GolfCourse {
 }
 
 class PresidioBackNine : Presidio {
-  override var par : Int { // expected-error{{cannot override non-'throws' property with 'throws' property}}
+  override var par : Int { // expected-error{{cannot override non-throwing property with throwing property}}
     get throws { 36 } // attempts to put the 'throws' effect back
   }
 
-  override subscript(_ i : Int) -> Int { // expected-error{{cannot override non-'async' subscript with 'async' subscript}}
+  override subscript(_ i : Int) -> Int { // expected-error{{cannot override non-async subscript with async subscript}}
     get async throws { 0 }
   }
 }

test/decl/func/rethrows.swift

@@ -71,10 +71,10 @@ class C1 : Super {
 
 class C2 : Super {
   override func tf() throws {}
-  override func nf() throws {} // expected-error {{cannot override non-throwing method with throwing method}}
+  override func nf() throws {} // expected-error {{cannot override non-throwing instance method with throwing instance method}}
 
   override func thf(_ f: () throws -> ()) throws {}
-  override func nhf(_ f: () throws -> ()) throws {} // expected-error {{cannot override non-throwing method with throwing method}}
+  override func nhf(_ f: () throws -> ()) throws {} // expected-error {{cannot override non-throwing instance method with throwing instance method}}
   override func rhf(_ f: () throws -> ()) throws {} // expected-error {{override of 'rethrows' method should also be 'rethrows'}}
 }
 
@@ -83,7 +83,7 @@ class C3 : Super {
   override func nf() {}
 
   override func thf(_ f: () throws -> ()) rethrows {}
-  override func nhf(_ f: () throws -> ()) rethrows {} // expected-error {{cannot override non-throwing method with throwing method}}
+  override func nhf(_ f: () throws -> ()) rethrows {} // expected-error {{cannot override non-throwing instance method with throwing instance method}}
   override func rhf(_ f: () throws -> ()) rethrows {}
 }
 

test/decl/protocol/effectful_properties.swift

@@ -314,12 +314,12 @@ protocol HammeredDulcimer {
 }
 
 protocol Santur : HammeredDulcimer {
-  override subscript(_ note : Int) -> Int { get throws } // expected-error{{cannot override non-'throws' subscript with 'throws' subscript}}
+  override subscript(_ note : Int) -> Int { get throws } // expected-error{{cannot override non-throwing subscript with throwing subscript}}
   override var bridges : Int { get throws }
 }
 
 protocol Santoor : Santur {
-  override var bridges : Int { get async throws } // expected-error{{cannot override non-'async' property with 'async' property}}
+  override var bridges : Int { get async throws } // expected-error{{cannot override non-async property with async property}}
 }
 
 protocol Yangqin : HammeredDulcimer {
@@ -328,5 +328,5 @@ protocol Yangqin : HammeredDulcimer {
 
 protocol Hackbrett : HammeredDulcimer {
  override var bridges : Int { get } // no effects are OK
- override subscript(_ note : Int) -> Int { get async throws } // expected-error {{cannot override non-'async' subscript with 'async' subscript}}
+ override subscript(_ note : Int) -> Int { get async throws } // expected-error {{cannot override non-async subscript with async subscript}}
 }