[Diagnostics] Remove a few special cases of printing 'any' for specific

error messages.

Author: hborla

include/swift/AST/DiagnosticsSema.def

@@ -2454,8 +2454,8 @@ ERROR(protocol_composition_one_class,none,
       "contains class %1", (Type, Type))
 
 ERROR(requires_conformance_nonprotocol,none,
-      "type %0 constrained to non-protocol, non-class type '%1'",
-      (Type, StringRef))
+      "type %0 constrained to non-protocol, non-class type %1",
+      (Type, Type))
 NOTE(requires_conformance_nonprotocol_fixit,none,
      "use '%0 == %1' to require '%0' to be '%1'",
      (StringRef, StringRef))
@@ -2776,9 +2776,9 @@ WARNING(anyobject_class_inheritance_deprecated,Deprecation,
 ERROR(multiple_inheritance,none,
   "multiple inheritance from classes %0 and %1", (Type, Type))
 ERROR(inheritance_from_non_protocol_or_class,none,
-  "inheritance from non-protocol, non-class type '%0'", (StringRef))
+  "inheritance from non-protocol, non-class type %0", (Type))
 ERROR(inheritance_from_non_protocol,none,
-  "inheritance from non-protocol type '%0'", (StringRef))
+  "inheritance from non-protocol type %0", (Type))
 ERROR(inheritance_from_anyobject,none,
   "only protocols can inherit from 'AnyObject'", ())
 ERROR(inheritance_from_parameterized_protocol,none,

lib/AST/GenericSignatureBuilder.cpp

@@ -6307,16 +6307,8 @@ GenericSignatureBuilder::finalize(TypeArrayView<GenericTypeParamType> genericPar
       auto source = constraint.source;
       auto loc = source->getLoc();
 
-      // FIXME: The constraint string is printed directly here because
-      // the current default is to not print `any` for existential
-      // types, but this error message is super confusing without `any`
-      // if the user wrote it explicitly.
-      PrintOptions options;
-      options.PrintExplicitAny = true;
-      auto constraintString = constraintType.getString(options);
-
       Diags.diagnose(loc, diag::requires_conformance_nonprotocol,
-                     subjectType, constraintString);
+                     subjectType, constraintType);
 
       auto getNameWithoutSelf = [&](std::string subjectTypeName) {
         std::string selfSubstring = "Self.";
@@ -6331,10 +6323,12 @@ GenericSignatureBuilder::finalize(TypeArrayView<GenericTypeParamType> genericPar
       if (allowConcreteGenericParams ||
           (subjectType->is<DependentMemberType>() &&
            !source->isProtocolRequirement())) {
-        auto subjectTypeName = subjectType.getString();
+        auto options = PrintOptions::forDiagnosticArguments();
+        auto subjectTypeName = subjectType.getString(options);
         auto subjectTypeNameWithoutSelf = getNameWithoutSelf(subjectTypeName);
         Diags.diagnose(loc, diag::requires_conformance_nonprotocol_fixit,
-                       subjectTypeNameWithoutSelf, constraintString)
+                       subjectTypeNameWithoutSelf,
+                       constraintType.getString(options))
              .fixItReplace(loc, " == ");
       }
     }

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -547,16 +547,8 @@ bool swift::rewriting::diagnoseRequirementErrors(
       if (subjectType->hasError() || constraint->hasError())
         break;
 
-      // FIXME: The constraint string is printed directly here because
-      // the current default is to not print `any` for existential
-      // types, but this error message is super confusing without `any`
-      // if the user wrote it explicitly.
-      PrintOptions options;
-      options.PrintExplicitAny = true;
-      auto constraintString = constraint.getString(options);
-
       ctx.Diags.diagnose(loc, diag::requires_conformance_nonprotocol,
-                         subjectType, constraintString);
+                         subjectType, constraint);
       diagnosedError = true;
 
       auto getNameWithoutSelf = [&](std::string subjectTypeName) {
@@ -570,10 +562,12 @@ bool swift::rewriting::diagnoseRequirementErrors(
       };
 
       if (allowConcreteGenericParams) {
-        auto subjectTypeName = subjectType.getString();
+        auto options = PrintOptions::forDiagnosticArguments();
+        auto subjectTypeName = subjectType.getString(options);
         auto subjectTypeNameWithoutSelf = getNameWithoutSelf(subjectTypeName);
         ctx.Diags.diagnose(loc, diag::requires_conformance_nonprotocol_fixit,
-                           subjectTypeNameWithoutSelf, constraintString)
+                           subjectTypeNameWithoutSelf,
+                           constraint.getString(options))
              .fixItReplace(loc, " == ");
       }
 

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -335,19 +335,11 @@ static void checkInheritanceClause(
       }
     }
 
-    // FIXME: The inherited type is printed directly here because
-    // the current default is to not print `any` for existential
-    // types, but this error message is super confusing without `any`
-    // if the user wrote it explicitly.
-    PrintOptions options;
-    options.PrintExplicitAny = true;
-    auto inheritedTyString = inheritedTy.getString(options);
-
     // We can't inherit from a non-class, non-protocol type.
     decl->diagnose(canHaveSuperclass
                    ? diag::inheritance_from_non_protocol_or_class
                    : diag::inheritance_from_non_protocol,
-                   inheritedTyString);
+                   inheritedTy);
     // FIXME: Note pointing to the declaration 'inheritedTy' references?
   }
 }