Rename: TypeConstructorMismatch -> ParameterConstraintError

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java

@@ -458,7 +458,7 @@ public interface Errors {
     DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_CANNOT_CAPTURE_TYPES = DiagnosticFactory1.create(ERROR);
-    DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory0<PsiElement> TYPE_INFERENCE_INCORPORATION_ERROR = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_UPPER_BOUND_VIOLATED = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory2<JetExpression, JetType, JetType> TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH = DiagnosticFactory2.create(ERROR);
@@ -708,7 +708,8 @@ public interface Errors {
             UNUSED_VARIABLE, UNUSED_PARAMETER, ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE, VARIABLE_WITH_REDUNDANT_INITIALIZER,
             UNUSED_FUNCTION_LITERAL, USELESS_CAST, UNUSED_VALUE, USELESS_ELVIS);
     ImmutableSet<? extends DiagnosticFactory<?>> TYPE_INFERENCE_ERRORS = ImmutableSet.of(
-            TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH,
+            TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS,
+            TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR,
             TYPE_INFERENCE_UPPER_BOUND_VIOLATED, TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH);
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -592,7 +592,7 @@ public class DefaultErrorMessages {
         MAP.put(TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, "Type inference failed: {0}", TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER);
         MAP.put(TYPE_INFERENCE_CANNOT_CAPTURE_TYPES, "Type inference failed: {0}", TYPE_INFERENCE_CANNOT_CAPTURE_TYPES_RENDERER);
         MAP.put(TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, "Type inference failed: {0}", TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER);
-        MAP.put(TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH, "Type inference failed: {0}", TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER);
+        MAP.put(TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR, "Type inference failed: {0}", TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER);
         MAP.put(TYPE_INFERENCE_INCORPORATION_ERROR, "Type inference failed. Please try to specify type arguments explicitly.");
         MAP.put(TYPE_INFERENCE_UPPER_BOUND_VIOLATED, "{0}", TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER);
         MAP.put(TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, "Type inference failed. Expected type mismatch: found: {1} required: {0}", RENDER_TYPE, RENDER_TYPE);

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt

@@ -123,8 +123,8 @@ public object Renderers {
         renderConflictingSubstitutionsInferenceError(it, TabledDescriptorRenderer.create()).toString()
     }
 
-    public val TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER: Renderer<InferenceErrorData> = Renderer {
+    public val TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER: Renderer<InferenceErrorData> = Renderer {
-        renderTypeConstructorMismatchError(it, TabledDescriptorRenderer.create()).toString()
+        renderParameterConstraintError(it, TabledDescriptorRenderer.create()).toString()
     }
 
     public val TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer<InferenceErrorData> = Renderer {
@@ -195,11 +195,11 @@ public object Renderers {
     }
 
     platformStatic
-    public fun renderTypeConstructorMismatchError(
+    public fun renderParameterConstraintError(
             inferenceErrorData: InferenceErrorData, renderer: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
         val constraintErrors = (inferenceErrorData.constraintSystem as ConstraintSystemImpl).constraintErrors
-        val errorPositions = constraintErrors.filter { it is TypeConstructorMismatch }.map { it.constraintPosition }
+        val errorPositions = constraintErrors.filter { it is ParameterConstraintError }.map { it.constraintPosition }
         return renderer.table(
                 TabledDescriptorRenderer
                         .newTable()

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java

@@ -227,8 +227,8 @@ public abstract class AbstractTracingStrategy implements TracingStrategy {
         else if (status.hasViolatedUpperBound()) {
             trace.report(TYPE_INFERENCE_UPPER_BOUND_VIOLATED.on(reference, data));
         }
-        else if (status.hasTypeConstructorMismatch()) {
+        else if (status.hasParameterConstraintError()) {
-            trace.report(TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH.on(reference, data));
+            trace.report(TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR.on(reference, data));
         }
         else if (status.hasConflictingConstraints()) {
             trace.report(TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS.on(reference, data));

compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: true
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/checkStatus/successful.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds

@@ -10,7 +10,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds

@@ -10,7 +10,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: true
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: true

compiler/testData/constraintSystem/computeValues/contradiction.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: true
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: true
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds

@@ -10,7 +10,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds

@@ -11,7 +11,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds

@@ -15,7 +15,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds

@@ -15,7 +15,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds

@@ -15,7 +15,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
@@ -20,4 +20,4 @@ status:
 
 result:
 T=Int
-P=Consumer<Consumer<Int>>
+P=Consumer<Consumer<Int>>

compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds

@@ -14,7 +14,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds

@@ -14,7 +14,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds

@@ -14,7 +14,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds

@@ -15,7 +15,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds

@@ -14,7 +14,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds

@@ -11,11 +11,11 @@ status:
 -hasConflictingConstraints: true
 -hasContradiction: true
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: true
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false
 -isSuccessful: false
 
 result:
-T=???
+T=???

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: true
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false

compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds

@@ -12,7 +12,7 @@ status:
 -hasConflictingConstraints: false
 -hasContradiction: false
 -hasErrorInConstrainingTypes: false
--hasTypeConstructorMismatch: false
+-hasParameterConstraintError: false
 -hasTypeInferenceIncorporationError: false
 -hasUnknownParameters: false
 -hasViolatedUpperBound: false