[Tests] Update tests.

Author: amritpan

test/Constraints/rdar68155466.swift

@@ -10,7 +10,8 @@ import Foundation
 }
 
 // FIXME: the diagnostic below ideally should have been emitted (rdar://106241733)
-struct Loop< // note {{required by generic struct 'Loop' where 'ID' = '() -> Int'}}
+struct Loop< 
+// expected-note@-1 {{required by generic struct 'Loop' where 'ID' = '() -> Int'}}
   Data : RandomAccessCollection,
   ID : Hashable,
   Content
@@ -25,6 +26,6 @@ func data() -> [A] {
   return []
 }
 
-_ = Loop(data(), id: \.uniqueID) { $0 } // expected-error {{key path cannot refer to instance method 'uniqueID()'}}
-// FIXME: the diagnostics below ideally should have been emitted (rdar://106241733)
-// error@-1 {{type '() -> Int' cannot conform to 'Hashable'}} note@-1 {{only concrete types such as structs, enums and classes can conform to protocols}}
+_ = Loop(data(), id: \.uniqueID) { $0 } 
+// expected-error@-1 {{type '() -> Int' cannot conform to 'Hashable'}}
+// expected-note@-2 {{only concrete types such as structs, enums and classes can conform to protocols}}

test/attr/attr_dynamic_member_lookup.swift

@@ -668,8 +668,8 @@ func test_chain_of_recursive_lookups(_ lens: Lens<Lens<Lens<Point>>>) {
   _ = \Lens<Lens<Point>>.obj.x
 }
 
-// KeyPath Dynamic Member Lookup can't refer to methods, mutating setters and static members
-// because of the KeyPath limitations
+// KeyPath Dynamic Member Lookup can't refer mutating setters because of the
+// KeyPath limitations
 func invalid_refs_through_dynamic_lookup() {
   struct S {
     static var foo: Int = 42
@@ -683,9 +683,9 @@ func invalid_refs_through_dynamic_lookup() {
 
   func test(_ lens: A<S>) {
     _ = lens.foo           // expected-error {{static member 'foo' cannot be used on instance of type 'S'}}
-    _ = lens.bar()         // expected-error {{dynamic key path member lookup cannot refer to instance method 'bar()'}}
-    _ = lens.bar().faz + 1 // expected-error {{dynamic key path member lookup cannot refer to instance method 'bar()'}}
-    _ = lens.baz("hello")  // expected-error {{dynamic key path member lookup cannot refer to static method 'baz'}}
+    _ = lens.bar()
+    _ = lens.bar().faz + 1 
+    _ = lens.baz("hello")  // expected-error {{static member 'baz' cannot be used on instance of type 'S'}}
   }
 }
 

test/expr/unary/keypath/keypath.swift

@@ -824,13 +824,13 @@ func test_keypath_with_method_refs() {
     static func bar() -> Int { return 0 }
   }
 
-  let _: KeyPath<S, Int> = \.foo // expected-error {{key path cannot refer to instance method 'foo()'}}
+  let _: KeyPath<S, Int> = \.foo
   // expected-error@-1 {{cannot assign value of type 'KeyPath<S, () -> Int>' to type 'KeyPath<S, Int>'}}
   // expected-note@-2 {{arguments to generic parameter 'Value' ('() -> Int' and 'Int') are expected to be equal}}
-  let _: KeyPath<S, Int> = \.bar // expected-error {{key path cannot refer to static method 'bar()'}}
+  let _: KeyPath<S, Int> = \.bar // expected-error {{static member 'bar()' cannot be used on instance of type 'S'}}
   // expected-error@-1 {{cannot assign value of type 'KeyPath<S, () -> Int>' to type 'KeyPath<S, Int>'}}
   // expected-note@-2 {{arguments to generic parameter 'Value' ('() -> Int' and 'Int') are expected to be equal}}
-  let _ = \S.Type.bar // expected-error {{key path cannot refer to static method 'bar()'}}
+  let _ = \S.Type.bar
 
   struct A {
     func foo() -> B { return B() }
@@ -841,10 +841,10 @@ func test_keypath_with_method_refs() {
     var bar: Int = 42
   }
 
-  let _: KeyPath<A, Int> = \.foo.bar // expected-error {{key path cannot refer to instance method 'foo()'}}
-  let _: KeyPath<A, Int> = \.faz.bar // expected-error {{key path cannot refer to static method 'faz()'}}
-  let _ = \A.foo.bar // expected-error {{key path cannot refer to instance method 'foo()'}}
-  let _ = \A.Type.faz.bar // expected-error {{key path cannot refer to static method 'faz()'}}
+  let _: KeyPath<A, Int> = \.foo.bar // expected-error {{type of expression is ambiguous without a type annotation}}
+  let _: KeyPath<A, Int> = \.faz.bar // expected-error {{static member 'faz()' cannot be used on instance of type 'A'}}
+  let _ = \A.foo.bar // expected-error {{type of expression is ambiguous without a type annotation}}
+  let _ = \A.Type.faz.bar // expected-error {{type of expression is ambiguous without a type annotation}}
 }
 
 // https://github.com/apple/swift/issues/54961
@@ -856,7 +856,7 @@ protocol Zonk {
 typealias Blatz = (gloop: String, zoop: Zonk?)
 
 func f_54961(fleep: [Blatz]) {
-  fleep.compactMap(\.zoop?.wargle) // expected-error {{key path cannot refer to instance method 'wargle()'}}
+  let _ = fleep.compactMap(\.zoop?.wargle)
 }
 
 // https://github.com/apple/swift/issues/52867
@@ -1091,8 +1091,8 @@ func testSyntaxErrors() {
 
 // https://github.com/apple/swift/issues/56996
 func f_56996() {
-  _ = \Int.byteSwapped.signum() // expected-error {{invalid component of Swift key path}}
-  _ = \Int.byteSwapped.init() // expected-error {{invalid component of Swift key path}}
+  _ = \Int.byteSwapped.signum()
+  _ = \Int.byteSwapped.init() // expected-error {{static member 'init()' cannot be used on instance of type 'Int'}}
   _ = \Int // expected-error {{key path must have at least one component}}
   _ = \Int? // expected-error {{key path must have at least one component}}
   _ = \Int. // expected-error {{invalid component of Swift key path}}