Merge pull request swiftlang#28110 from benlangmuir/diag-foo

xedin · web-flow · commit 29a17d57b259 · 2019-11-06T11:03:05.000-08:00
Update diagnostic after CS change
diff --git a/validation-test/Sema/type_checker_perf/fast/rdar21374729.swift b/validation-test/Sema/type_checker_perf/fast/rdar21374729.swift
@@ -7,11 +7,9 @@ protocol P {
 }
 
 class R<T> : P where T : P, T.A == T.Type {
-  // expected-note@-1 {{'T' declared as parameter to type 'R'}}
   typealias A = T.Type
   static func fn(args: T.Type) {}
 }
 
 R.fn(args: R.self)
-// expected-error@-1 {{generic parameter 'T' could not be inferred}}
-// expected-note@-2 {{explicitly specify the generic arguments to fix this issue}}
+// expected-error@-1 {{type of expression is ambiguous without more context}}

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,9 @@ protocol P {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`class R<T> : P where T : P, T.A == T.Type {`
`10`		`- // expected-note@-1 {{'T' declared as parameter to type 'R'}}`
`11`	`10`	`typealias A = T.Type`
`12`	`11`	`static func fn(args: T.Type) {}`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`R.fn(args: R.self)`
`16`		`-// expected-error@-1 {{generic parameter 'T' could not be inferred}}`
`17`		`-// expected-note@-2 {{explicitly specify the generic arguments to fix this issue}}`
	`15`	`+// expected-error@-1 {{type of expression is ambiguous without more context}}`