Merge remote-tracking branch 'benlangmuir/fixit-protocol-comp'

Conflicts:
	lib/FrontendTool/FrontendTool.cpp
	test/FixCode/fixits-apply.swift
	test/FixCode/fixits-apply.swift.result

Author: benlangmuir

lib/FrontendTool/FrontendTool.cpp

@@ -636,7 +636,10 @@ class JSONFixitWriter : public DiagnosticConsumer {
         Info.ID == diag::selector_literal_deprecated_suggest.ID ||
         Info.ID == diag::attr_noescape_deprecated.ID ||
         Info.ID == diag::attr_autoclosure_escaping_deprecated.ID ||
-        Info.ID == diag::any_as_anyobject_fixit.ID)
+        Info.ID == diag::any_as_anyobject_fixit.ID ||
+        Info.ID == diag::deprecated_protocol_composition.ID ||
+        Info.ID == diag::deprecated_protocol_composition_single.ID ||
+        Info.ID == diag::deprecated_any_composition.ID)
       return true;
 
     return false;

test/FixCode/fixits-apply.swift

@@ -240,3 +240,9 @@ func testEnumRename() { _ = E.Abc }
 func testAnyToAnyObject(x: Any) {
   x.instMeth(p: 1)
 }
+
+func testProtocolCompositionSyntax() {
+  var _: protocol<>
+  var _: protocol<Prot1>
+  var _: protocol<Prot1, Prot2>
+}

test/FixCode/fixits-apply.swift.result

@@ -243,3 +243,9 @@ func testEnumRename() { _ = E.Abc }
 func testAnyToAnyObject(x: Any) {
   (x as AnyObject).instMeth(p: 1)
 }
+
+func testProtocolCompositionSyntax() {
+  var _: Any
+  var _: Prot1
+  var _: Prot1 & Prot2
+}