[Diagnostics] NFC: Use non-initializer diagnostic when raw representable type doesn't conform but .rawValue does

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -6842,7 +6842,7 @@ AbstractRawRepresentableFailure::getDiagnostic() const {
   } else if (locator->isLastElement<LocatorPathElt::ApplyArgToParam>()) {
     return diag::cannot_convert_argument_value;
   } else if (locator->isLastElement<LocatorPathElt::AnyRequirement>()) {
-    return diag::cannot_convert_initializer_value_protocol;
+    return diag::type_does_not_conform;
   }
 
   return None;

test/ClangImporter/newtype_conformance.swift

@@ -20,7 +20,7 @@ func acceptComparable<T: Comparable>(_: T) {}
 func testNewTypeWrapper(x: NSNotification.Name, y: NSNotification.Name) {
   acceptEquatable(x)
   acceptHashable(x)
-  acceptComparable(x) // expected-error {{value of type 'NSNotification.Name' does not conform to specified type 'Comparable'}} {{19-19=.rawValue}}
+  acceptComparable(x) // expected-error {{type 'NSNotification.Name' does not conform to protocol 'Comparable'}} {{19-19=.rawValue}}
 
   _ = x == y
   _ = x != y