[TypeChecker] NFC: Adjust tests improved by new approach for ambiguity diagnosis

Author: xedin

test/AutoDiff/Sema/differentiable_func_type.swift

@@ -175,18 +175,20 @@ extension Vector: Differentiable where T: Differentiable {
   mutating func move(along direction: TangentVector) { fatalError() }
 }
 
+// expected-note@+1 2 {{candidate requires that 'Int' conform to 'Differentiable' (requirement specified as 'T' == 'Differentiable')}}
 func inferredConformancesGeneric<T, U>(_: @differentiable (Vector<T>) -> Vector<U>) {}
 
+// expected-note  @+5 2 {{candidate requires that 'Int' conform to 'Differentiable' (requirement specified as 'T' == 'Differentiable')}}
 // expected-error @+4 {{generic signature requires types 'Vector<T>' and 'Vector<T>.TangentVector' to be the same}}
 // expected-error @+3 {{generic signature requires types 'Vector<U>' and 'Vector<U>.TangentVector' to be the same}}
 // expected-error @+2 {{parameter type 'Vector<T>' does not conform to 'Differentiable' and satisfy 'Vector<T> == Vector<T>.TangentVector', but the enclosing function type is '@differentiable(linear)'}}
 // expected-error @+1 {{result type 'Vector<U>' does not conform to 'Differentiable' and satisfy 'Vector<U> == Vector<U>.TangentVector', but the enclosing function type is '@differentiable(linear)'}}
 func inferredConformancesGenericLinear<T, U>(_: @differentiable(linear) (Vector<T>) -> Vector<U>) {}
 
 func nondiff(x: Vector<Int>) -> Vector<Int> {}
-// expected-error @+1 {{global function 'inferredConformancesGeneric' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGeneric'}}
 inferredConformancesGeneric(nondiff)
-// expected-error @+1 {{global function 'inferredConformancesGenericLinear' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGenericLinear'}}
 inferredConformancesGenericLinear(nondiff)
 
 func diff(x: Vector<Float>) -> Vector<Float> {}
@@ -208,16 +210,16 @@ extension Linear: Differentiable where T: Differentiable, T == T.TangentVector {
   typealias TangentVector = Self
 }
 
-// expected-note @+1 2 {{where 'T' = 'Int'}}
+// expected-note @+1 2 {{candidate requires that 'Int' conform to 'Differentiable' (requirement specified as 'T' == 'Differentiable')}}
 func inferredConformancesGeneric<T, U>(_: @differentiable (Linear<T>) -> Linear<U>) {}
 
-// expected-note @+1 2 {{where 'T' = 'Int'}}
+// expected-note @+1 2 {{candidate requires that 'Int' conform to 'Differentiable' (requirement specified as 'T' == 'Differentiable')}}
 func inferredConformancesGenericLinear<T, U>(_: @differentiable(linear) (Linear<T>) -> Linear<U>) {}
 
 func nondiff(x: Linear<Int>) -> Linear<Int> {}
-// expected-error @+1 {{global function 'inferredConformancesGeneric' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGeneric'}}
 inferredConformancesGeneric(nondiff)
-// expected-error @+1 {{global function 'inferredConformancesGenericLinear' requires that 'Int' conform to 'Differentiable}}
+// expected-error @+1 {{no exact matches in call to global function 'inferredConformancesGenericLinear'}}
 inferredConformancesGenericLinear(nondiff)
 
 func diff(x: Linear<Float>) -> Linear<Float> {}

test/ClangImporter/objc_factory_method.swift

@@ -75,7 +75,7 @@ func testNSErrorFactoryMethod(_ path: String) throws {
 }
 
 func testNonInstanceTypeFactoryMethod(_ s: String) {
-  _ = NSObjectFactory(string: s) // expected-error{{argument passed to call that takes no arguments}}
+  _ = NSObjectFactory(string: s) // expected-error{{no exact matches in call to initializer}}
 }
 
 func testUseOfFactoryMethod(_ queen: Bee) {

test/ClangImporter/objc_implicit_with.swift

@@ -43,7 +43,7 @@ func testNSErrorFactoryMethod(_ path: String) throws {
 }
 
 func testNonInstanceTypeFactoryMethod(_ s: String) {
-  _ = NSObjectFactory(string: s) // expected-error{{argument passed to call that takes no arguments}}
+  _ = NSObjectFactory(string: s) // expected-error{{no exact matches in call to initializer}}
 }
 
 func testUseOfFactoryMethod(_ queen: Bee) {

test/Constraints/argument_matching.swift

@@ -1465,167 +1465,8 @@ _ = acceptTuple2(tuple1)
 _ = acceptTuple2((1, "hello", 3.14159))
 
 
-func generic_and_missing_label(x: Int) {}
-func generic_and_missing_label<T>(x: T) {}
+func generic_and_missing_label(x: Int) {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(x:)')}}
+func generic_and_missing_label<T>(x: T) {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(x:)')}}
 
 generic_and_missing_label(42)
-// expected-error@-1 {{missing argument label 'x:' in call}} {{27-27=x: }}
-
-// -------------------------------------------
-// Curried functions
-// -------------------------------------------
-
-func f7(_ a: Int) -> (_ b: Int) -> Int {
-  return { b in a+b }
-}
-
-_ = f7(1)(1)
-f7(1.0)(2)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
-f7(1)(1.0)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-f7(1)(b: 1.0)    // expected-error{{extraneous argument label 'b:' in call}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
-let f10 = f7(2)
-_ = f10(1)
-f10(10)          // expected-warning {{result of call to function returning 'Int' is unused}}
-f10(1.0)         // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-f10(b: 1.0)         // expected-error {{extraneous argument label 'b:' in call}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
-
-class CurriedClass {
-  func method1() {}
-  func method2(_ a: Int) -> (_ b : Int) -> () { return { b in () } }
-  func method3(_ a: Int, b : Int) {}  // expected-note 3 {{'method3(_:b:)' declared here}}
-}
-
-let c = CurriedClass()
-_ = c.method1
-c.method1(1)         // expected-error {{argument passed to call that takes no arguments}}
-_ = c.method2(1)
-_ = c.method2(1.0)   // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-c.method2(1)(2)
-c.method2(1)(c: 2)   // expected-error {{extraneous argument label 'c:' in call}}
-c.method2(1)(c: 2.0) // expected-error {{extraneous argument label 'c:' in call}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-c.method2(1)(2.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-c.method2(1.0)(2) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-c.method2(1.0)(2.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
-CurriedClass.method1(c)()
-_ = CurriedClass.method1(c)
-CurriedClass.method1(c)(1)         // expected-error {{argument passed to call that takes no arguments}}
-CurriedClass.method1(2.0)(1)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'CurriedClass'}}
-// expected-error@-1:27 {{argument passed to call that takes no arguments}}
-
-CurriedClass.method2(c)(32)(b: 1) // expected-error{{extraneous argument label 'b:' in call}}
-_ = CurriedClass.method2(c)
-_ = CurriedClass.method2(c)(32)
-_ = CurriedClass.method2(1,2)      // expected-error {{extra argument in call}}
-// expected-error@-1 {{instance member 'method2' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
-CurriedClass.method2(c)(1.0)(b: 1) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-// expected-error@-1 {{extraneous argument label 'b:' in call}}
-CurriedClass.method2(c)(1)(1.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-CurriedClass.method2(c)(2)(c: 1.0) // expected-error {{extraneous argument label 'c:'}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-
-CurriedClass.method3(c)(32, b: 1)
-_ = CurriedClass.method3(c)
-_ = CurriedClass.method3(c)(1, 2)        // expected-error {{missing argument label 'b:' in call}} {{32-32=b: }}
-_ = CurriedClass.method3(c)(1, b: 2)(32) // expected-error {{cannot call value of non-function type '()'}}
-_ = CurriedClass.method3(1, 2)           // expected-error {{instance member 'method3' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
-// expected-error@-1 {{missing argument label 'b:' in call}}
-CurriedClass.method3(c)(1.0, b: 1)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-CurriedClass.method3(c)(1)               // expected-error {{missing argument for parameter 'b' in call}}
-CurriedClass.method3(c)(c: 1.0)          // expected-error {{incorrect argument labels in call (have 'c:', expected '_:b:')}}
-// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
-// expected-error@-2 {{missing argument for parameter #1 in call}}
-
-
-extension CurriedClass {
-  func f() {
-    method3(1, b: 2)
-    method3()            // expected-error {{missing arguments for parameters #1, 'b' in call}} {{13-13=<#Int#>, b: <#Int#>}}
-    method3(42)          // expected-error {{missing argument for parameter 'b' in call}}
-    method3(self)
-    // expected-error@-1:13 {{cannot convert value of type 'CurriedClass' to expected argument type 'Int'}}
-    // expected-error@-2:17 {{missing argument for parameter 'b' in call}} {{17-17=, b: <#Int#>}}
-  }
-}
-
-extension CurriedClass {
-  func m1(_ a : Int, b : Int) {}
-  
-  func m2(_ a : Int) {}
-}
-
-// <rdar://problem/23718816> QoI: "Extra argument" error when accidentally currying a method
-CurriedClass.m1(2, b: 42)   // expected-error {{instance member 'm1' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
-
-
-// <rdar://problem/22108559> QoI: Confusing error message when calling an instance method as a class method
-CurriedClass.m2(12)  // expected-error {{instance member 'm2' cannot be used on type 'CurriedClass'; did you mean to use a value of this type instead?}}
-
-// -------------------------------------------
-// Multiple label errors
-// -------------------------------------------
-
-func testLabelErrorsBasic() {
-  func f(_ aa: Int, _ bb: Int, cc: Int, dd: Int, ee: Int, ff: Int) {}
-
-  // 1 wrong
-  f(0, 1, ccx: 2, dd: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{incorrect argument label in call (have '_:_:ccx:dd:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{none}}
-
-  // 1 missing
-  f(0, 1, 2, dd: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{missing argument label 'cc:' in call}} {{11-11=cc: }} {{none}}
-
-  // 1 extra
-  f(aa: 0, 1, cc: 2, dd: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{extraneous argument label 'aa:' in call}} {{5-9=}} {{none}}
-
-  // 1 ooo
-  f(0, 1, dd: 3, cc: 2, ee: 4, ff: 5)
-  // expected-error@-1 {{argument 'cc' must precede argument 'dd'}} {{16-23=}} {{11-11=cc: 2, }} {{none}}
-
-  // 2 wrong
-  f(0, 1, ccx: 2, ddx: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:ddx:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{19-22=dd}} {{none}}
-
-  // 2 missing
-  f(0, 1, 2, 3, ee: 4, ff: 5)
-  // expected-error@-1 {{missing argument labels 'cc:dd:' in call}} {{11-11=cc: }} {{14-14=dd: }} {{none}}
-
-  // 2 extra
-  f(aa: 0, bb: 1, cc: 2, dd: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{extraneous argument labels 'aa:bb:' in call}} {{5-9=}} {{12-16=}} {{none}}
-
-  // 2 ooo
-  f(0, 1, dd: 3, cc: 2, ff: 5, ee: 4)
-  // expected-error@-1 {{argument 'cc' must precede argument 'dd'}} {{16-23=}} {{11-11=cc: 2, }} {{none}}
-
-  // 1 wrong + 1 missing
-  f(0, 1, ccx: 2, 3, ee: 4, ff: 5)
-  // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:_:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{19-19=dd: }} {{none}}
-
-  // 1 wrong + 1 extra
-  f(aa: 0, 1, ccx: 2, dd: 3, ee: 4, ff: 5)
-  // expected-error@-1 {{incorrect argument labels in call (have 'aa:_:ccx:dd:ee:ff:', expected '_:_:cc:dd:ee:ff:')}} {{5-9=}} {{15-18=cc}} {{none}}
-
-  // 1 wrong + 1 ooo
-  f(0, 1, ccx: 2, dd: 3, ff: 5, ee: 4)
-  // expected-error@-1 {{incorrect argument labels in call (have '_:_:ccx:dd:ff:ee:', expected '_:_:cc:dd:ee:ff:')}} {{11-14=cc}} {{26-28=ee}} {{33-35=ff}} {{none}}
-}
-
-struct DiagnoseAllLabels {
-  func f(aa: Int, bb: Int, cc: Int..., dd: Int, ee: Int = 0, ff: Int = 0) {}
-
-  func test() {
-    f(aax: 0, bbx: 1, cc: 21, 22, 23, dd: 3, ff: 5) // expected-error {{incorrect argument labels in call (have 'aax:bbx:cc:_:_:dd:ff:', expected 'aa:bb:cc:_:_:dd:ff:')}} {{7-10=aa}} {{15-18=bb}} {{none}}
-
-    f(aax: 0, bbx: 1, dd: 3, ff: 5) // expected-error {{incorrect argument labels in call (have 'aax:bbx:dd:ff:', expected 'aa:bb:dd:ff:')}} {{7-10=aa}} {{15-18=bb}} {{none}}
-  }
-}
+// expected-error@-1 {{no exact matches in call to global function 'generic_and_missing_label'}}

test/Constraints/closures.swift

@@ -562,7 +562,6 @@ r32432145 { _,_ in
 // rdar://problem/30106822 - Swift ignores type error in closure and presents a bogus error about the caller
 [1, 2].first { $0.foo = 3 }
 // expected-error@-1 {{value of type 'Int' has no member 'foo'}}
-// expected-error@-2 {{cannot convert value of type '()' to closure result type 'Bool'}}
 
 // rdar://problem/32433193, SR-5030 - Higher-order function diagnostic mentions the wrong contextual type conversion problem
 protocol A_SR_5030 {
@@ -827,7 +826,7 @@ func rdar_40537960() {
   }
 
   var arr: [S] = []
-  _ = A(arr, fn: { L($0.v) }) // expected-error {{cannot convert value of type 'L' to closure result type 'R<P>'}}
+  _ = A(arr, fn: { L($0.v) })
   // expected-error@-1 {{generic parameter 'P' could not be inferred}}
   // expected-note@-2 {{explicitly specify the generic arguments to fix this issue}} {{8-8=<[S], <#P: P_40537960#>>}}
 }

test/Constraints/diagnostics.swift

@@ -407,8 +407,9 @@ enum Color {
   static var svar: Color { return .Red }
 }
 
-let _: (Int, Color) = [1,2].map({ ($0, .Unknown("")) }) // expected-error {{cannot convert value of type 'Array<(Int, _)>' to specified type '(Int, Color)'}}
-// expected-error@-1 {{cannot infer contextual base in reference to member 'Unknown'}}
+let _: (Int, Color) = [1,2].map({ ($0, .Unknown("")) })
+// expected-error@-1 {{no 'map' candidates produce the expected contextual result type '(Int, Color)'}}
+// expected-note@-2 {{found candidate with type '((Int) throws -> (Int, _)) throws -> Array<(Int, _)>'}}
 
 let _: [(Int, Color)] = [1,2].map({ ($0, .Unknown("")) })// expected-error {{missing argument label 'description:' in call}}
 
@@ -1248,10 +1249,9 @@ func f11(_ n: Int) {}
 func f11<T : P2>(_ n: T, _ f: @escaping (T) -> T) {}  // expected-note {{where 'T' = 'Int'}}
 f11(3, f4) // expected-error {{global function 'f11' requires that 'Int' conform to 'P2'}}
 
-// FIXME: Arguably we should also prefer the conformance failure in this case.
-let f12: (Int) -> Void = { _ in }
-func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {}
-f12(3, f4)// expected-error {{extra argument in call}}
+let f12: (Int) -> Void = { _ in } // expected-note {{candidate '(Int) -> Void' requires 1 argument, but 2 were provided}}
+func f12<T : P2>(_ n: T, _ f: @escaping (T) -> T) {} // expected-note {{candidate requires that 'Int' conform to 'P2' (requirement specified as 'T' == 'P2')}}
+f12(3, f4)// expected-error {{no exact matches in call to global function 'f12'}}
 
 // SR-12242
 struct SR_12242_R<Value> {}

test/Constraints/dynamic_lookup.swift

@@ -338,7 +338,7 @@ func testOverloadedWithUnavailable(ao: AnyObject) {
 
 func dynamicInitCrash(ao: AnyObject.Type) {
   let sdk = ao.init(blahblah: ())
-  // expected-error@-1 {{incorrect argument label in call (have 'blahblah:', expected 'toMemory:')}}
+  // expected-error@-1 {{no exact matches in call to initializer}}
 }
 
 // Test that we correctly diagnose ambiguity for different typed members available

test/Constraints/fixes.swift

@@ -358,8 +358,6 @@ func testKeyPathSubscriptArgFixes(_ fn: @escaping () -> Int) {
 }
 
 func sr12426(a: Any, _ str: String?) {
-  a == str // expected-error {{cannot convert value of type 'Any' to expected argument type 'String'}}
-  // expected-error@-1 {{value of optional type 'String?' must be unwrapped to a value of type 'String'}}
-  // expected-note@-2 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
-  // expected-note@-3 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
+  a == str // expected-error {{binary operator '==' cannot be applied to operands of type 'Any' and 'String?'}}
+  // expected-note@-1 {{overloads for '==' exist with these partially matching parameter lists: (String, String)}}
 }

test/Constraints/function.swift

@@ -62,12 +62,12 @@ func test() {
 
 // <rdar://problem/19962010> QoI: argument label mismatches produce not-great diagnostic
 class A {
-  func a(_ text:String) {
+  func a(_ text:String) { // expected-note {{incorrect labels for candidate (have: '(text:)', expected: '(_:)')}}
   }
-  func a(_ text:String, something:Int?=nil) {
+  func a(_ text:String, something:Int?=nil) { // expected-note {{incorrect labels for candidate (have: '(text:)', expected: '(_:)')}}
   }
 }
-A().a(text:"sometext") // expected-error{{extraneous argument label 'text:' in call}}{{7-12=}}
+A().a(text:"sometext") // expected-error{{no exact matches in call to instance method 'a'}}
 
 
 // <rdar://problem/22451001> QoI: incorrect diagnostic when argument to print has the wrong type

test/Constraints/rdar42678836.swift

@@ -1,5 +1,6 @@
 // RUN: %target-typecheck-verify-swift
 
 func foo(chr: Character) -> String {
-  return String(repeating: String(chr)) // expected-error {{missing argument for parameter 'count' in call}} {{39-39=, count: <#Int#>}}
+  return String(repeating: String(chr)) // expected-error {{no exact matches in call to initializer}}
+  // expected-note@-1 {{candidate has partially matching parameter list (repeating: String, count: Int)}}
 }