Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 873132598447 · 2019-02-15T09:09:04.000-08:00
diff --git a/validation-test/stdlib/PhotosTests.swift b/validation-test/stdlib/PhotosTests.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-swift-frontend -typecheck %s
 
 // REQUIRES: objc_interop
 // UNSUPPORTED: OS=watchos

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift`
	`1`	`+// RUN: %target-swift-frontend -typecheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: objc_interop`
`4`	`4`	`// UNSUPPORTED: OS=watchos`