Rename diagnostic groups to CamelCase

Author: DmT021

include/swift/AST/DiagnosticGroups.def

@@ -22,50 +22,26 @@
 
 GROUP(no_group, "")
 
-GROUP(deprecated, "deprecated.md")
-GROUP_LINK(deprecated, anyobject_class_inheritance_deprecated)
-GROUP_LINK(deprecated, attr_implementationOnly_deprecated)
-GROUP_LINK(deprecated, attr_objcImplementation_deprecated)
-GROUP_LINK(deprecated, availability_deprecated)
-GROUP_LINK(deprecated, borrowing_in_pattern_matches_deprecated)
-GROUP_LINK(deprecated, conditional_conformance_outer_access_deprecated)
-GROUP_LINK(deprecated, conformance_availability_deprecated)
-GROUP_LINK(deprecated, executor_enqueue_owned_job_implementation_deprecated)
-GROUP_LINK(deprecated, hashvalue_implementation_deprecated)
-GROUP_LINK(deprecated, implicit_bridging_header_imported_from_module_deprecated)
-GROUP_LINK(deprecated, implicitly_unwrapped_optional_deprecated)
-GROUP_LINK(deprecated, invalid_redecl_swift5_deprecated)
-GROUP_LINK(deprecated, one_pattern_for_several_associated_values_deprecated)
-GROUP_LINK(deprecated, property_wrapper_init_initialValue_deprecated)
-GROUP_LINK(deprecated, property_wrapper_wrapperValue_deprecated)
-GROUP_LINK(deprecated, reordering_tuple_shuffle_deprecated)
-GROUP_LINK(deprecated, selector_string_literal_deprecated)
-GROUP_LINK(deprecated, unlabeled_trailing_closure_deprecated)
-GROUP_LINK(deprecated, witness_deprecated)
-GROUP_LINK(deprecated, writable_keypath_to_readonly_property_deprecated)
+GROUP(DeprecatedAnyObjectClassInheritance, "DeprecatedAnyObjectClassInheritance.md")
+GROUP(DeprecatedAttrImplementationOnly, "DeprecatedAttrImplementationOnly.md")
+GROUP(DeprecatedAttrObjcImplementation, "DeprecatedAttrObjcImplementation.md")
+GROUP(DeprecatedBorrowingInPatternMatches, "DeprecatedBorrowingInPatternMatches.md")
+GROUP(DeprecatedConditionalConformanceOuterAccess, "DeprecatedConditionalConformanceOuterAccess.md")
+GROUP(DeprecatedDeclaration, "DeprecatedDeclaration.md")
+GROUP(DeprecatedExecutorEnqueueOwnedJobImplementation, "DeprecatedExecutorEnqueueOwnedJobImplementation.md")
+GROUP(DeprecatedHashValueImplementation, "DeprecatedHashValueImplementation.md")
+GROUP(DeprecatedImplicitImportOfBridgingHeaderFromModule, "DeprecatedImplicitImportOfBridgingHeaderFromModule.md")
+GROUP(DeprecatedImplicitlyUnwrappedOptional, "DeprecatedImplicitlyUnwrappedOptional.md")
+GROUP(DeprecatedInvalidRedeclSwift5, "DeprecatedInvalidRedeclSwift5.md")
+GROUP(DeprecatedMatchingMultipleAssociatedValuesAsTuple, "DeprecatedMatchingMultipleAssociatedValuesAsTuple.md")
+GROUP(DeprecatedPropertyWrapperInitInitialValue, "DeprecatedPropertyWrapperInitInitialValue.md")
+GROUP(DeprecatedPropertyWrapperWrapperValue, "DeprecatedPropertyWrapperWrapperValue.md")
+GROUP(DeprecatedReorderingTupleShuffle, "DeprecatedReorderingTupleShuffle.md")
+GROUP(DeprecatedSelectorStringLiteral, "DeprecatedSelectorStringLiteral.md")
+GROUP(DeprecatedUnlabeledTrailingClosure, "DeprecatedUnlabeledTrailingClosure.md")
+GROUP(DeprecatedWritableKeypathToReadonlyProperty, "DeprecatedWritableKeypathToReadonlyProperty.md")
 
-GROUP(anyobject_class_inheritance_deprecated, "anyobject_class_inheritance_deprecated.md")
-GROUP(attr_implementationOnly_deprecated, "attr_implementationOnly_deprecated.md")
-GROUP(attr_objcImplementation_deprecated, "attr_objcImplementation_deprecated.md")
-GROUP(availability_deprecated, "availability_deprecated.md")
-GROUP(borrowing_in_pattern_matches_deprecated, "borrowing_in_pattern_matches_deprecated.md")
-GROUP(conditional_conformance_outer_access_deprecated, "conditional_conformance_outer_access_deprecated.md")
-GROUP(conformance_availability_deprecated, "conformance_availability_deprecated.md")
-GROUP(executor_enqueue_owned_job_implementation_deprecated, "executor_enqueue_owned_job_implementation_deprecated.md")
-GROUP(hashvalue_implementation_deprecated, "hashvalue_implementation_deprecated.md")
-GROUP(implicit_bridging_header_imported_from_module_deprecated, "implicit_bridging_header_imported_from_module_deprecated.md")
-GROUP(implicitly_unwrapped_optional_deprecated, "implicitly_unwrapped_optional_deprecated.md")
-GROUP(invalid_redecl_swift5_deprecated, "invalid_redecl_swift5_deprecated.md")
-GROUP(one_pattern_for_several_associated_values_deprecated, "one_pattern_for_several_associated_values_deprecated.md")
-GROUP(property_wrapper_init_initialValue_deprecated, "property_wrapper_init_initialValue_deprecated.md")
-GROUP(property_wrapper_wrapperValue_deprecated, "property_wrapper_wrapperValue_deprecated.md")
-GROUP(reordering_tuple_shuffle_deprecated, "reordering_tuple_shuffle_deprecated.md")
-GROUP(selector_string_literal_deprecated, "selector_string_literal_deprecated.md")
-GROUP(unlabeled_trailing_closure_deprecated, "unlabeled_trailing_closure_deprecated.md")
-GROUP(witness_deprecated, "witness_deprecated.md")
-GROUP(writable_keypath_to_readonly_property_deprecated, "writable_keypath_to_readonly_property_deprecated.md")
-
-GROUP(unknown_warning_group, "unknown_warning_group.md")
+GROUP(UnknownWarningGroup, "UnknownWarningGroup.md")
 
 #define UNDEFINE_DIAGNOSTIC_GROUPS_MACROS
 #include "swift/AST/DefineDiagnosticGroupsMacros.h"

include/swift/AST/DiagnosticsClangImporter.def

@@ -100,7 +100,7 @@ NOTE(clang_param_should_be_implicitly_sendable,none,
      "handler", ())
 
 GROUPED_WARNING(implicit_bridging_header_imported_from_module,
-                implicit_bridging_header_imported_from_module_deprecated, none,
+                DeprecatedImplicitImportOfBridgingHeaderFromModule, none,
                 "implicit import of bridging header '%0' via module %1 "
                 "is deprecated and will be removed in a later version of Swift",
                 (StringRef, Identifier))

include/swift/AST/DiagnosticsFrontend.def

@@ -89,7 +89,7 @@ ERROR(error_missing_arg_value,none,
       (StringRef, unsigned))
 ERROR(error_unknown_arg,none,
       "unknown argument: '%0'", (StringRef))
-GROUPED_WARNING(unknown_warning_group, unknown_warning_group, none,
+GROUPED_WARNING(unknown_warning_group, UnknownWarningGroup, none,
                 "unknown warning group: '%0'", (StringRef))
 ERROR(error_invalid_arg_value,none,
       "invalid value '%1' in '%0'", (StringRef, StringRef))

include/swift/AST/DiagnosticsParse.def

@@ -974,7 +974,7 @@ ERROR(extra_var_in_multiple_pattern_list,none,
 ERROR(let_pattern_in_immutable_context,none,
       "'let' pattern cannot appear nested in an already immutable context", ())
 GROUPED_WARNING(borrowing_syntax_change,
-                borrowing_in_pattern_matches_deprecated, none,
+                DeprecatedBorrowingInPatternMatches, none,
                 "'borrowing' in pattern matches is deprecated; use 'let'", ())
 ERROR(borrowing_subpattern_unsupported,none,
       "'borrowing' pattern modifier must be directly applied to pattern variable name", ())

include/swift/AST/DiagnosticsSema.def

@@ -722,7 +722,7 @@ ERROR(cannot_convert_type_to_keypath_subscript_index,none,
       (Type))
 GROUPED_WARNING(
     expr_deprecated_writable_keypath,
-    writable_keypath_to_readonly_property_deprecated, Deprecation,
+    DeprecatedWritableKeypathToReadonlyProperty, Deprecation,
     "forming a writable keypath to property %0 that is read-only in this "
     "context is deprecated and will be removed in a future release",
     (const ValueDecl *))
@@ -776,12 +776,12 @@ WARNING(selector_literal_invalid,none,
 WARNING(selector_literal_undeclared,none,
         "no method declared with Objective-C selector %0", (ObjCSelector))
 GROUPED_WARNING(
-    selector_literal_deprecated, selector_string_literal_deprecated, Deprecation,
+    selector_literal_deprecated, DeprecatedSelectorStringLiteral, Deprecation,
     "use of string literal for Objective-C selectors is deprecated; "
     "use '#selector' or explicitly construct a 'Selector'",
     ())
 GROUPED_WARNING(
-    selector_literal_deprecated_suggest, selector_string_literal_deprecated,
+    selector_literal_deprecated_suggest, DeprecatedSelectorStringLiteral,
     Deprecation,
     "use of string literal for Objective-C selectors is deprecated; "
     "use '#selector' instead",
@@ -1040,7 +1040,7 @@ ERROR(invalid_redecl_implicit,none,
       "%select{%0|implementation for protocol requirement}1 %2",
       (DescriptiveDeclKind, bool, const ValueDecl *))
 GROUPED_WARNING(
-    invalid_redecl_swift5_warning, invalid_redecl_swift5_deprecated,
+    invalid_redecl_swift5_warning, DeprecatedInvalidRedeclSwift5,
     Deprecation,
     "redeclaration of %0 is deprecated and will be an error in Swift 5",
     (const ValueDecl *))
@@ -1189,7 +1189,7 @@ WARNING(implementation_only_requires_library_evolution,none,
         "for %0 may lead to instability during execution",
         (Identifier))
 GROUPED_WARNING(
-    implementation_only_deprecated, attr_implementationOnly_deprecated, none,
+    implementation_only_deprecated, DeprecatedAttrImplementationOnly, none,
     "'@_implementationOnly' is deprecated, use 'internal import' instead", ())
 
 ERROR(module_allowable_client_violation,none,
@@ -1605,7 +1605,7 @@ ERROR(closure_bad_param,none,
       "accept a closure", (Type, bool))
 GROUPED_WARNING(
     unlabeled_trailing_closure_deprecated,
-    unlabeled_trailing_closure_deprecated, Deprecation,
+    DeprecatedUnlabeledTrailingClosure, Deprecation,
     "backward matching of the unlabeled trailing closure is deprecated; label "
     "the argument with %0 to suppress this warning",
     (Identifier))
@@ -1777,7 +1777,7 @@ ERROR(swift_native_objc_runtime_base_not_on_root_class,none,
 
 GROUPED_WARNING(
     objc_implementation_early_spelling_deprecated,
-    attr_objcImplementation_deprecated, none,
+    DeprecatedAttrObjcImplementation, none,
     "'@_objcImplementation' is deprecated; use '@implementation' instead", ())
 ERROR(attr_objc_implementation_must_be_unconditional,none,
       "only unconditional extensions can implement an Objective-C '@interface'",
@@ -3148,7 +3148,7 @@ ERROR(witness_unavailable,none,
         (const ValueDecl *, const ProtocolDecl *, StringRef))
 
 GROUPED_WARNING(
-    witness_deprecated, witness_deprecated, none,
+    witness_deprecated, DeprecatedDeclaration, none,
     "deprecated default implementation is used to satisfy %kind0 required by "
     "protocol %1%select{|: %2}2",
     (const ValueDecl *, Identifier, StringRef))
@@ -3516,7 +3516,7 @@ WARNING(duplicate_anyobject_class_inheritance,none,
 ERROR(inheritance_from_protocol_with_superclass,none,
   "inheritance from class-constrained protocol composition type %0", (Type))
 GROUPED_WARNING(anyobject_class_inheritance_deprecated,
-                anyobject_class_inheritance_deprecated, Deprecation,
+                DeprecatedAnyObjectClassInheritance, Deprecation,
                 "using 'class' keyword to define a class-constrained protocol "
                 "is deprecated; use 'AnyObject' instead",
                 ())
@@ -4781,7 +4781,7 @@ NOTE(fix_unqualified_access_top_level_multi,none,
 
 GROUPED_WARNING(
     warn_deprecated_conditional_conformance_outer_access,
-    conditional_conformance_outer_access_deprecated, Deprecation,
+    DeprecatedConditionalConformanceOuterAccess, Deprecation,
     "use of %0 as reference to %1 in %kind2 will change in future versions "
     "of Swift to reference %3 in %kind4 which comes via a conditional "
     "conformance",
@@ -5179,7 +5179,7 @@ ERROR(tuple_pattern_in_non_tuple_context,none,
       "tuple pattern cannot match values of the non-tuple type %0", (Type))
 GROUPED_WARNING(
     found_one_pattern_for_several_associated_values,
-    one_pattern_for_several_associated_values_deprecated, Deprecation,
+    DeprecatedMatchingMultipleAssociatedValuesAsTuple, Deprecation,
     "enum case '%0' has %1 associated values; matching them as a tuple "
     "is deprecated",
     (StringRef, unsigned))
@@ -6090,7 +6090,7 @@ WARNING(implicitly_unwrapped_optional_in_illegal_position_interpreted_as_optiona
 
 GROUPED_WARNING(
     implicitly_unwrapped_optional_deprecated_in_this_position,
-    implicitly_unwrapped_optional_deprecated, Deprecation,
+    DeprecatedImplicitlyUnwrappedOptional, Deprecation,
     "using '!' here is deprecated and will be removed in a future release", ())
 
 ERROR(implicitly_unwrapped_optional_in_illegal_position,none,
@@ -6675,14 +6675,14 @@ NOTE(availability_obsoleted, none,
      "%0 was obsoleted in %1 %2",
      (const ValueDecl *, StringRef, llvm::VersionTuple))
 
-GROUPED_WARNING(availability_deprecated, availability_deprecated, Deprecation,
+GROUPED_WARNING(availability_deprecated, DeprecatedDeclaration, Deprecation,
                 "%0 %select{is|%select{is|was}3}1 "
                 "deprecated%select{| in %2%select{| %4}3}1%select{|: %5}5",
                 (const ValueDecl *, bool, StringRef, bool, llvm::VersionTuple,
                  StringRef))
 
 GROUPED_WARNING(
-      availability_deprecated_rename, availability_deprecated, Deprecation,
+      availability_deprecated_rename, DeprecatedDeclaration, Deprecation,
       "%0 %select{is|%select{is|was}3}1 "
       "deprecated%select{| in %2%select{| %4}3}1: "
       "%select{renamed to|replaced by}5%" REPLACEMENT_DECL_KIND_SELECT "6 "
@@ -6861,7 +6861,7 @@ NOTE(conformance_availability_obsoleted, none,
      (Type, Type, StringRef, llvm::VersionTuple))
 
 GROUPED_WARNING(conformance_availability_deprecated,
-                conformance_availability_deprecated, Deprecation,
+                DeprecatedDeclaration, Deprecation,
                 "conformance of %0 to %1 %select{is|%select{is|was}4}2 "
                 "deprecated%select{| in %3%select{| %5}4}2%select{|: %6}6",
                 (Type, Type, bool, StringRef, bool, llvm::VersionTuple,
@@ -7132,14 +7132,14 @@ ERROR(override_nsobject_hash_error,none,
       "did you mean to override 'NSObject.hash'?", ())
 
 GROUPED_WARNING(
-    hashvalue_implementation, hashvalue_implementation_deprecated, Deprecation,
+    hashvalue_implementation, DeprecatedHashValueImplementation, Deprecation,
     "'Hashable.hashValue' is deprecated as a protocol requirement; "
     "conform type %0 to 'Hashable' by implementing 'hash(into:)' instead",
     (Type))
 
 GROUPED_WARNING(
     executor_enqueue_deprecated_owned_job_implementation,
-    executor_enqueue_owned_job_implementation_deprecated, Deprecation,
+    DeprecatedExecutorEnqueueOwnedJobImplementation, Deprecation,
     "'Executor.enqueue(Job)' is deprecated as a protocol requirement; "
     "conform type %0 to 'Executor' by implementing 'func enqueue(ExecutorJob)' "
     "instead",
@@ -7261,14 +7261,14 @@ ERROR(property_wrapper_type_not_usable_from_inline,none,
       "must be '@usableFromInline' or public",
       (bool, bool))
 GROUPED_WARNING(
-    property_wrapper_wrapperValue, property_wrapper_wrapperValue_deprecated,
+    property_wrapper_wrapperValue, DeprecatedPropertyWrapperWrapperValue,
     Deprecation,
     "property wrapper's 'wrapperValue' property should be renamed to "
     "'projectedValue'; use of 'wrapperValue' is deprecated",
     ())
 GROUPED_WARNING(
     property_wrapper_init_initialValue,
-    property_wrapper_init_initialValue_deprecated, Deprecation,
+    DeprecatedPropertyWrapperInitInitialValue, Deprecation,
     "property wrapper's 'init(initialValue:)' should be renamed "
     "to 'init(wrappedValue:)'; use of 'init(initialValue:)' is deprecated",
     ())
@@ -7396,7 +7396,7 @@ ERROR(result_builder_buildpartialblock_accumulated_not_accessible,none,
 //------------------------------------------------------------------------------
 
 GROUPED_WARNING(warn_reordering_tuple_shuffle_deprecated,
-                reordering_tuple_shuffle_deprecated, Deprecation,
+                DeprecatedReorderingTupleShuffle, Deprecation,
                 "expression shuffles the elements of this tuple; "
                 "this behavior is deprecated",
                 ())

lib/AST/DiagnosticGroups.cpp

@@ -209,9 +209,9 @@ constexpr bool isGroupInSupergroup() {
   return false;
 }
 // Check for isGroupInSupergroup itself
-static_assert(
-    !isGroupInSupergroup<DiagGroupID::no_group, DiagGroupID::deprecated>() &&
-    "Bug in isGroupInSupergroup");
+static_assert(!isGroupInSupergroup<DiagGroupID::no_group,
+                                   DiagGroupID::DeprecatedDeclaration>() &&
+              "Bug in isGroupInSupergroup");
 
 static_assert(!hasCycle(), "Diagnostic groups graph has a cycle!");
 // Sanity check for the "no_group" group
@@ -220,33 +220,32 @@ static_assert(std::get<0>(diagnosticGroupConnections).supergroups.size() == 0,
               "no_group isn't a top-level group");
 static_assert(std::get<0>(diagnosticGroupConnections).subgroups.size() == 0,
               "no_group shouldn't have subgroups");
-// Check groups have expected supergroups
-#define CHECK_RELATION(Parent, Child)                                          \
+// Check groups have associated diagnostics
+#define CHECK_NOT_EMPTY(Group)                                                 \
   static_assert(                                                               \
-      isGroupInSupergroup<DiagGroupID::Child, DiagGroupID::Parent>(),          \
-      "'" #Child "' must be a child of '" #Parent "'");
-CHECK_RELATION(deprecated, anyobject_class_inheritance_deprecated)
-CHECK_RELATION(deprecated, attr_implementationOnly_deprecated)
-CHECK_RELATION(deprecated, attr_objcImplementation_deprecated)
-CHECK_RELATION(deprecated, availability_deprecated)
-CHECK_RELATION(deprecated, borrowing_in_pattern_matches_deprecated)
-CHECK_RELATION(deprecated, conditional_conformance_outer_access_deprecated)
-CHECK_RELATION(deprecated, conformance_availability_deprecated)
-CHECK_RELATION(deprecated, executor_enqueue_owned_job_implementation_deprecated)
-CHECK_RELATION(deprecated, hashvalue_implementation_deprecated)
-CHECK_RELATION(deprecated,
-               implicit_bridging_header_imported_from_module_deprecated)
-CHECK_RELATION(deprecated, implicitly_unwrapped_optional_deprecated)
-CHECK_RELATION(deprecated, invalid_redecl_swift5_deprecated)
-CHECK_RELATION(deprecated, one_pattern_for_several_associated_values_deprecated)
-CHECK_RELATION(deprecated, property_wrapper_init_initialValue_deprecated)
-CHECK_RELATION(deprecated, property_wrapper_wrapperValue_deprecated)
-CHECK_RELATION(deprecated, reordering_tuple_shuffle_deprecated)
-CHECK_RELATION(deprecated, selector_string_literal_deprecated)
-CHECK_RELATION(deprecated, unlabeled_trailing_closure_deprecated)
-CHECK_RELATION(deprecated, witness_deprecated)
-CHECK_RELATION(deprecated, writable_keypath_to_readonly_property_deprecated)
-#undef CHECK_RELATION
+      std::get<(uint16_t)DiagGroupID::Group>(diagnosticGroupConnections)       \
+              .diagnostics.size() > 0,                                         \
+      "'" #Group "' group shouldn't be empty.");
+CHECK_NOT_EMPTY(DeprecatedAnyObjectClassInheritance)
+CHECK_NOT_EMPTY(DeprecatedAttrImplementationOnly)
+CHECK_NOT_EMPTY(DeprecatedAttrObjcImplementation)
+CHECK_NOT_EMPTY(DeprecatedBorrowingInPatternMatches)
+CHECK_NOT_EMPTY(DeprecatedConditionalConformanceOuterAccess)
+CHECK_NOT_EMPTY(DeprecatedDeclaration)
+CHECK_NOT_EMPTY(DeprecatedExecutorEnqueueOwnedJobImplementation)
+CHECK_NOT_EMPTY(DeprecatedHashValueImplementation)
+CHECK_NOT_EMPTY(DeprecatedImplicitImportOfBridgingHeaderFromModule)
+CHECK_NOT_EMPTY(DeprecatedImplicitlyUnwrappedOptional)
+CHECK_NOT_EMPTY(DeprecatedInvalidRedeclSwift5)
+CHECK_NOT_EMPTY(DeprecatedMatchingMultipleAssociatedValuesAsTuple)
+CHECK_NOT_EMPTY(DeprecatedPropertyWrapperInitInitialValue)
+CHECK_NOT_EMPTY(DeprecatedPropertyWrapperWrapperValue)
+CHECK_NOT_EMPTY(DeprecatedReorderingTupleShuffle)
+CHECK_NOT_EMPTY(DeprecatedSelectorStringLiteral)
+CHECK_NOT_EMPTY(DeprecatedUnlabeledTrailingClosure)
+CHECK_NOT_EMPTY(DeprecatedWritableKeypathToReadonlyProperty)
+CHECK_NOT_EMPTY(UnknownWarningGroup)
+#undef CHECK_NOT_EMPTY
 
 } // end namespace validation