Merge pull request #9155 from CodaFi/redundant-notes-for-redundant-folks

Remove an unnecessary StringRef from a Space Engine diagnostic

Author: CodaFi

include/swift/AST/DiagnosticsSema.def

@@ -3614,7 +3614,7 @@ ERROR(empty_switch_stmt,none,
 ERROR(non_exhaustive_switch,none,
       "%select{switch must be exhaustive, consider adding |do you want to add }0"
       "%select{missing cases|a default clause}1"
-      "%select{:|?}0 %2", (bool, bool, StringRef))
+      "%select{:|?}0", (bool, bool))
 NOTE(missing_particular_case,none,
      "missing case: '%0'", (StringRef))
 WARNING(redundant_particular_case,none,

lib/Sema/TypeCheckSwitchStmt.cpp

@@ -902,7 +902,7 @@ namespace {
              .fixItInsert(EndLoc, Buffer.str());
         } else {
           Ctx.Diags.diagnose(StartLoc, diag::non_exhaustive_switch,
-                             InEditor, uncovered.isEmpty(), "")
+                             InEditor, uncovered.isEmpty())
              .fixItInsert(EndLoc, Buffer.str());
         }
         return;
@@ -938,13 +938,11 @@ namespace {
           }
         }
 
-        Ctx.Diags
-            .diagnose(StartLoc, diag::non_exhaustive_switch, InEditor, false,
-                      Buffer.str())
-            .fixItInsert(EndLoc, Buffer.str());
+        Ctx.Diags.diagnose(StartLoc, diag::non_exhaustive_switch, InEditor,
+                           false).fixItInsert(EndLoc, Buffer.str());
       } else {
         Ctx.Diags.diagnose(StartLoc, diag::non_exhaustive_switch,
-                           InEditor, false, Buffer.str());
+                           InEditor, false);
 
         for (auto &uncoveredSpace : uncovered.getSpaces()) {
           SmallVector<Space, 4> flats;