[NFC] Diag: Rename error_in_future_swift_version wrappers

Be clear that these are about language mode.

Author: AnthonyLatsis

include/swift/AST/DiagnosticsCommon.def

@@ -47,15 +47,15 @@ ERROR(error_no_group_info,none,
 NOTE(brace_stmt_suggest_do,none,
      "did you mean to use a 'do' statement?", ())
 
-// `error_in_future_swift_version` does not have a group because warnings of this kind
-// inherit the group from the wrapped error.
-WARNING(error_in_future_swift_version,none,
+// This does not have a group because warnings of this kind inherit the group
+// from the wrapped error.
+WARNING(error_in_swift_lang_mode,none,
         "%0; this is an error in the Swift %1 language mode",
         (DiagnosticInfo *, unsigned))
 
-// `error_in_a_future_swift_version` does not have a group because warnings of this kind
-// inherit the group from the wrapped error.
-WARNING(error_in_a_future_swift_version,none,
+// This does not have a group because warnings of this kind inherit the group
+// from the wrapped error.
+WARNING(error_in_a_future_swift_lang_mode,none,
         "%0; this will be an error in a future Swift language mode",
         (DiagnosticInfo *))
 

include/swift/AST/EducationalNotes.def

@@ -86,7 +86,7 @@ EDUCATIONAL_NOTES(result_builder_missing_build_array,
 EDUCATIONAL_NOTES(multiple_inheritance,
                   "multiple-inheritance.md")
 
-EDUCATIONAL_NOTES(error_in_future_swift_version,
+EDUCATIONAL_NOTES(error_in_swift_lang_mode,
                   "error-in-future-swift-version.md")
 
 #undef EDUCATIONAL_NOTES

lib/AST/DiagnosticEngine.cpp

@@ -431,9 +431,9 @@ InFlightDiagnostic::limitBehaviorUntilSwiftVersion(
     // wrapIn will result in the behavior of the wrapping diagnostic.
     if (limit >= DiagnosticBehavior::Warning) {
       if (majorVersion > 6) {
-        wrapIn(diag::error_in_a_future_swift_version);
+        wrapIn(diag::error_in_a_future_swift_lang_mode);
       } else {
-        wrapIn(diag::error_in_future_swift_version, majorVersion);
+        wrapIn(diag::error_in_swift_lang_mode, majorVersion);
       }
     }
 

unittests/AST/DiagnosticGroupsTests.cpp

@@ -105,7 +105,7 @@ TEST(DiagnosticGroups, DiagnosticsWrappersInheritGroups) {
             .limitBehaviorUntilSwiftVersion(DiagnosticBehavior::Warning, 99);
       },
       [](const DiagnosticInfo &info) {
-        EXPECT_EQ(info.ID, diag::error_in_a_future_swift_version.ID);
+        EXPECT_EQ(info.ID, diag::error_in_a_future_swift_lang_mode.ID);
         EXPECT_TRUE(info.FormatString.ends_with(" [DeprecatedDeclaration]"));
       },
       /*expectedNumCallbackCalls=*/1);