simplify and rebrand diag::invalid_relation now that it can only produce

two messages.


Swift SVN r31320

Author: lattner

include/swift/AST/DiagnosticsSema.def

@@ -457,10 +457,9 @@ ERROR(load_of_explicit_lvalue,sema_tcc,none,
 //------------------------------------------------------------------------------
 // Expression Type Checking Errors
 //------------------------------------------------------------------------------
-ERROR(invalid_relation,sema_tcc,none,
-      "%1 is not %select{identical to|a subtype of|"
-      "convertible to|constructible with|identical to}0 %2",
-      (unsigned, Type, Type))
+ERROR(types_not_convertible,sema_tcc,none,
+      "%1 is not %select{convertible to|a subtype of}0 %2",
+      (bool, Type, Type))
 NOTE(in_cast_expr_types,sema_tcc,none,
       "in cast from type %0 to %1",
       (Type, Type))

lib/Sema/CSDiag.cpp

@@ -2394,14 +2394,8 @@ bool FailureDiagnosis::diagnoseGeneralConversionFailure(Constraint *constraint){
     return true;
   }
 
-  // FIXME: diag::invalid_relation is total overkill for this. In terms of the
-  // number of messages it can produce.
-  auto failureKind = Failure::FailureKind::TypesNotConvertible;
-  if (constraint->getKind() == ConstraintKind::Subtype)
-    failureKind = Failure::FailureKind::TypesNotSubtypes;
-
-  diagnose(anchor->getLoc(), diag::invalid_relation,
-           failureKind - Failure::TypesNotEqual,
+  diagnose(anchor->getLoc(), diag::types_not_convertible,
+           constraint->getKind() == ConstraintKind::Subtype,
            fromType, toType)
     .highlight(anchor->getSourceRange());