Correct diagnostic for plain member constraints

This used to print as just a plain space.

Resolves rdar://60030114

Author: CodaFi

include/swift/AST/DiagnosticsFrontend.def

@@ -396,7 +396,7 @@ ERROR(missing_member_dependency,none,
       "dependency does not exist: %1",
       (/*Expectation::Kind*/uint8_t, StringRef))
 ERROR(unexpected_dependency,none,
-      "unexpected %0 %select{%error|%error||potential member|dynamic member}1 "
+      "unexpected %0 %select{%error|%error|member|potential member|dynamic member}1 "
       "dependency: %2", (StringRef, /*Expectation::Kind*/uint8_t, StringRef))
 ERROR(unexpected_provided_entity,none,
       "unexpected provided entity: %0", (StringRef))

test/Incremental/fail/main.swift

@@ -1,14 +1,12 @@
-// REQUIRES: rdar60030114
-
 // RUN: %empty-directory(%t)
 // RUN: %{python} %S/../gen-output-file-map.py -o %t %S/Inputs -r %t.resp
 // RUN: cd %t
 // RUN: not %target-swiftc_driver -no-color-diagnostics -typecheck -output-file-map %t/output.json -incremental -module-name main -verify-incremental-dependencies @%t.resp 2>&1 | sort | %FileCheck %s
 
 // CHECK: unexpected dependency exists: main.BaseProtocol
-// CHECK: unexpected cascading dependency: main.Base.init
-// CHECK: unexpected cascading dependency: main.Subclass.deinit
-// CHECK: unexpected cascading dependency: main.Subclass.init
+// CHECK: unexpected cascading member dependency: main.Base.init
+// CHECK: unexpected cascading member dependency: main.Subclass.deinit
+// CHECK: unexpected cascading member dependency: main.Subclass.init
 // CHECK: unexpected cascading potential member dependency: main.Base
 // CHECK: unexpected provided entity: Base
 // CHECK: unexpected provided entity: BaseProtocol