Merge pull request swiftlang#33413 from xedin/rdar-66574239

xedin · web-flow · commit 671be54f25a3 · 2020-08-12T00:08:44.000-07:00
[TypeChecker] NFC: Clarify another flaky conformance diagnostic (only…
diff --git a/test/Sema/struct_equatable_hashable.swift b/test/Sema/struct_equatable_hashable.swift
@@ -114,8 +114,10 @@ struct StructWithoutExplicitConformance {
 }
 
 func structWithoutExplicitConformance() {
+  // FIXME(rdar://problem/64844584) - on iOS simulator this diagnostic is flaky
   // This diagnostic is about `Equatable` because it's considered the best possible solution among other ones for operator `==`.
-  if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { } // expected-error{{referencing operator function '==' on 'Equatable' requires that 'StructWithoutExplicitConformance' conform to 'Equatable'}}
+  if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { }
+  // expected-error@-1 {{requires that 'StructWithoutExplicitConformance' conform to 'Equatable'}}
 }
 
 // Structs with non-hashable/equatable stored properties don't derive conformance.

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,10 @@ struct StructWithoutExplicitConformance {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`func structWithoutExplicitConformance() {`
	`117`	`+ // FIXME(rdar://problem/64844584) - on iOS simulator this diagnostic is flaky`
`117`	`118`	// This diagnostic is about `Equatable` because it's considered the best possible solution among other ones for operator `==`.
`118`		`- if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { } // expected-error{{referencing operator function '==' on 'Equatable' requires that 'StructWithoutExplicitConformance' conform to 'Equatable'}}`
	`119`	`+ if StructWithoutExplicitConformance(a: 1, b: "b") == StructWithoutExplicitConformance(a: 2, b: "a") { }`
	`120`	`+ // expected-error@-1 {{requires that 'StructWithoutExplicitConformance' conform to 'Equatable'}}`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`// Structs with non-hashable/equatable stored properties don't derive conformance.`