[Diagnostics] NFC: Rename a fix/diagnostic for missing .rawValue reference

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -6359,8 +6359,7 @@ void MissingRawRepresentableInitFailure::fixIt(
   }
 }
 
-void UseOfRawRepresentableInsteadOfItsRawValueFailure::fixIt(
-    InFlightDiagnostic &diagnostic) const {
+void MissingRawValueFailure::fixIt(InFlightDiagnostic &diagnostic) const {
   auto *E = getAsExpr(getAnchor());
   if (!E)
     return;

lib/Sema/CSDiagnostics.h

@@ -2149,13 +2149,10 @@ class MissingRawRepresentableInitFailure final
 /// ```
 ///
 /// `E.one` has to use `.rawValue` to match `Int` expected by pattern binding.
-class UseOfRawRepresentableInsteadOfItsRawValueFailure final
-    : public AbstractRawRepresentableFailure {
+class MissingRawValueFailure final : public AbstractRawRepresentableFailure {
 public:
-  UseOfRawRepresentableInsteadOfItsRawValueFailure(const Solution &solution,
-                                                   Type rawReprType,
-                                                   Type expectedType,
-                                                   ConstraintLocator *locator)
+  MissingRawValueFailure(const Solution &solution, Type rawReprType,
+                         Type expectedType, ConstraintLocator *locator)
       : AbstractRawRepresentableFailure(solution, rawReprType, expectedType,
                                         locator) {}
 

lib/Sema/CSFix.cpp

@@ -1137,19 +1137,17 @@ ExplicitlyConstructRawRepresentable::create(ConstraintSystem &cs,
       cs, rawReprType, expectedType, locator);
 }
 
-bool UseValueTypeOfRawRepresentative::diagnose(const Solution &solution,
-                                               bool asNote) const {
-  UseOfRawRepresentableInsteadOfItsRawValueFailure failure(
-      solution, RawReprType, ExpectedType, getLocator());
+bool UseRawValue::diagnose(const Solution &solution, bool asNote) const {
+  MissingRawValueFailure failure(solution, RawReprType, ExpectedType,
+                                 getLocator());
   return failure.diagnose(asNote);
 }
 
-UseValueTypeOfRawRepresentative *
-UseValueTypeOfRawRepresentative::create(ConstraintSystem &cs, Type rawReprType,
-                                        Type expectedType,
-                                        ConstraintLocator *locator) {
+UseRawValue *UseRawValue::create(ConstraintSystem &cs, Type rawReprType,
+                                 Type expectedType,
+                                 ConstraintLocator *locator) {
   return new (cs.getAllocator())
-      UseValueTypeOfRawRepresentative(cs, rawReprType, expectedType, locator);
+      UseRawValue(cs, rawReprType, expectedType, locator);
 }
 
 unsigned AllowArgumentMismatch::getParamIdx() const {

lib/Sema/CSFix.h

@@ -213,9 +213,10 @@ enum class FixKind : uint8_t {
   /// via forming `Foo(rawValue:)` instead of using its `RawValue` directly.
   ExplicitlyConstructRawRepresentable,
 
-  /// Use raw value type associated with raw representative accessible
+  /// Use raw value type associated with raw representable, accessible
   /// using `.rawValue` member.
-  UseValueTypeOfRawRepresentative,
+  UseRawValue,
+
   /// If an array was passed to a variadic argument, give a specific diagnostic
   /// and offer to drop the brackets if it's a literal.
   ExpandArrayIntoVarargs,
@@ -264,7 +265,7 @@ enum class FixKind : uint8_t {
 
   /// Allow key path to be bound to a function type with more than 1 argument
   AllowMultiArgFuncKeyPathMismatch,
-  
+
   /// Specify key path root type when it cannot be infered from context.
   SpecifyKeyPathRootType,
 
@@ -1617,13 +1618,13 @@ class ExplicitlyConstructRawRepresentable final : public ConstraintFix {
          ConstraintLocator *locator);
 };
 
-class UseValueTypeOfRawRepresentative final : public ConstraintFix {
+class UseRawValue final : public ConstraintFix {
   Type RawReprType;
   Type ExpectedType;
 
-  UseValueTypeOfRawRepresentative(ConstraintSystem &cs, Type rawReprType,
-                                  Type expectedType, ConstraintLocator *locator)
-      : ConstraintFix(cs, FixKind::UseValueTypeOfRawRepresentative, locator),
+  UseRawValue(ConstraintSystem &cs, Type rawReprType, Type expectedType,
+              ConstraintLocator *locator)
+      : ConstraintFix(cs, FixKind::UseRawValue, locator),
         RawReprType(rawReprType), ExpectedType(expectedType) {}
 
 public:
@@ -1633,10 +1634,8 @@ class UseValueTypeOfRawRepresentative final : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
-  static UseValueTypeOfRawRepresentative *create(ConstraintSystem &cs,
-                                                 Type rawReprType,
-                                                 Type expectedType,
-                                                 ConstraintLocator *locator);
+  static UseRawValue *create(ConstraintSystem &cs, Type rawReprType,
+                             Type expectedType, ConstraintLocator *locator);
 };
 
 /// Replace a coercion ('as') with a forced checked cast ('as!').

lib/Sema/CSSimplify.cpp

@@ -3184,7 +3184,7 @@ bool ConstraintSystem::repairFailures(
     if (!isValueOfRawRepresentable(expectedType, rawReprType))
       return false;
 
-    conversionsOrFixes.push_back(UseValueTypeOfRawRepresentative::create(
+    conversionsOrFixes.push_back(UseRawValue::create(
         *this, rawReprType, expectedType, getConstraintLocator(locator)));
     return true;
   };
@@ -9578,7 +9578,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   case FixKind::UsePropertyWrapper:
   case FixKind::UseWrappedValue:
   case FixKind::ExpandArrayIntoVarargs:
-  case FixKind::UseValueTypeOfRawRepresentative:
+  case FixKind::UseRawValue:
   case FixKind::ExplicitlyConstructRawRepresentable:
   case FixKind::SpecifyBaseTypeForContextualMember:
   case FixKind::CoerceToCheckedCast: