[Diagnostics] NFC: Remove unused last argument from requirement failure notes

Author: xedin

include/swift/AST/DiagnosticsSema.def

@@ -1988,16 +1988,16 @@ NOTE(wrapped_type_satisfies_requirement,none,
      "wrapped type %0 satisfies this requirement; did you mean to unwrap?", (Type))
 NOTE(candidate_types_conformance_requirement,none,
      "candidate requires that %0 conform to %1 "
-     "(requirement specified as %2 : %3%4)",
-     (Type, Type, Type, Type, StringRef))
+     "(requirement specified as %2 : %3)",
+     (Type, Type, Type, Type))
 NOTE(candidate_types_equal_requirement,none,
      "candidate requires that the types %0 and %1 be equivalent "
-     "(requirement specified as %2 == %3%4)",
-     (Type, Type, Type, Type, StringRef))
+     "(requirement specified as %2 == %3)",
+     (Type, Type, Type, Type))
 NOTE(candidate_types_inheritance_requirement,none,
      "candidate requires that %1 inherit from %2 "
-     "(requirement specified as %2 : %3%4)",
-     (Type, Type, Type, Type, StringRef))
+     "(requirement specified as %2 : %3)",
+     (Type, Type, Type, Type))
 NOTE(types_not_equal_requirement,none,
      "requirement specified as %0 == %1%2", (Type, Type, StringRef))
 ERROR(type_is_not_a_class,none,

lib/Sema/CSDiagnostics.cpp

@@ -400,7 +400,7 @@ bool RequirementFailure::diagnoseAsNote() {
   const auto *reqDC = getRequirementDC();
 
   emitDiagnosticAt(reqDC->getAsDecl(), getDiagnosticAsNote(), getLHS(),
-                   getRHS(), req.getFirstType(), req.getSecondType(), "");
+                   getRHS(), req.getFirstType(), req.getSecondType());
   return true;
 }
 

lib/Sema/CSDiagnostics.h

@@ -235,7 +235,7 @@ class RequirementFailure : public FailureDiagnostic {
   using PathEltKind = ConstraintLocator::PathElementKind;
   using DiagOnDecl = Diag<DescriptiveDeclKind, DeclName, Type, Type>;
   using DiagInReference = Diag<DescriptiveDeclKind, DeclName, Type, Type, Type>;
-  using DiagAsNote = Diag<Type, Type, Type, Type, StringRef>;
+  using DiagAsNote = Diag<Type, Type, Type, Type>;
 
   /// If this failure associated with one of the conditional requirements,
   /// this field would represent conformance where requirement comes from.