diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index f337d9fe35d..0237d6a49e0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -458,7 +458,7 @@ public interface Errors { DiagnosticFactory1 TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_INFERENCE_CANNOT_CAPTURE_TYPES = DiagnosticFactory1.create(ERROR); - DiagnosticFactory1 TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH = DiagnosticFactory1.create(ERROR); + DiagnosticFactory1 TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR = DiagnosticFactory1.create(ERROR); DiagnosticFactory0 TYPE_INFERENCE_INCORPORATION_ERROR = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 TYPE_INFERENCE_UPPER_BOUND_VIOLATED = DiagnosticFactory1.create(ERROR); DiagnosticFactory2 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> 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); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index b1ae845790f..076ff54bf19 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/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); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index a3becd143a2..13ec5c20b30 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/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 = Renderer { - renderTypeConstructorMismatchError(it, TabledDescriptorRenderer.create()).toString() + public val TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER: Renderer = Renderer { + renderParameterConstraintError(it, TabledDescriptorRenderer.create()).toString() } public val TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer = 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() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java index 27db5955597..f7747eb3395 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/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()) { - trace.report(TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH.on(reference, data)); + else if (status.hasParameterConstraintError()) { + trace.report(TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR.on(reference, data)); } else if (status.hasConflictingConstraints()) { trace.report(TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS.on(reference, data)); diff --git a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds b/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds index d54e4653ded..3c867761ed0 100644 --- a/compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/checkStatus/successful.bounds b/compiler/testData/constraintSystem/checkStatus/successful.bounds index 583a8c21113..43ac39868b2 100644 --- a/compiler/testData/constraintSystem/checkStatus/successful.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds b/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds index 21e95269ed0..c009c45087d 100644 --- a/compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds b/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds index d31138ba9ec..c0af2c301bb 100644 --- a/compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds b/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds index c04981d28da..1d6590c012d 100644 --- a/compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/computeValues/contradiction.bounds b/compiler/testData/constraintSystem/computeValues/contradiction.bounds index efb7e8b91ae..24bbf15b783 100644 --- a/compiler/testData/constraintSystem/computeValues/contradiction.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds b/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds index c186adc7a48..377928d944f 100644 --- a/compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds index 2f87b1baa2e..b2ef6ae5068 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds b/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds index 0b752ee190d..d6b88ca835c 100644 --- a/compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds b/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds index 430a365cdaf..29d70c2e4d0 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds b/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds index 2abed7f9db8..b8a0f48d824 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds index c65b5ee1928..e2184e2315e 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds b/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds index 2b80c6cc94a..aed516efeff 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds b/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds index 8a3bb3af4ad..187b41062f0 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds index 7668d5a7d25..a4fae5c8324 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds index 4bf5959b522..7cde4a14c94 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds b/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds index 1b31cf385cb..b1d6044ccdc 100644 --- a/compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds index 8024f737d4f..767c74294bc 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds index c2fc7ab00de..7576d950b1a 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds index 0b0061363ab..65d4e213440 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds index 6f65f248bfa..6882e64a517 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds index 36a2e0520dc..36ece479442 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds index 39f56ee5890..dc9bd4ee09f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds index 4834575e0ad..aab4a696ef5 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds index 0a23d492e16..e43f73ab278 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds index 4f3044bf3b6..c5e1ad524d5 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds index 97cfc9021cc..fa29eb3243c 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds index a64e6b35110..25302882cae 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds index a7d277e6d78..8f82371393f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds index 2e6d9556f28..994192067e0 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds index 361dc47e8f3..9a1c367b17e 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds index 8639d321f5e..fc04cd651dd 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds index 23c0cb99974..c20ba05af7e 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds index 415a1a067ac..663ed0261f1 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds index 4fa524d6a8b..e687ac76a53 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds index e44ed01c3c5..2bf6c5e8394 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds index 5db77f8abf4..49bb91d9ec6 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds index 2607d61fdeb..bddbf2341d0 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds index 36b349629f5..420b8574da7 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds index d9bcc3cf734..5ce7369428f 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds index 981743dc98c..bfd0363ae79 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds index a57a227b879..ce9772e5472 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds index a83b3d88707..2a890311f20 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds index 0b14956e976..50c3e7a4752 100644 --- a/compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds index c1fc7b01a62..0dd2f8ada64 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds index 35b97462777..409c0397e2b 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds b/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds index 4cfdbef528f..18ab4706b1a 100644 --- a/compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds index 9288e38c616..7a0185605f3 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds index 73a23b485b7..d17252889f9 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds index b63d9d9b28d..5e12daa2b73 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds index 9a003bf92b4..f09b862aa25 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds index 8821b18fa86..56aacfab893 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds index 3dbaf11c438..0cde5ba6e85 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds index 2e3d20ba19a..3da6d94e777 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds index c20560721c9..e89d4a562fc 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds index bf5bf4045da..b495badd3a4 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds index 13417f5a50e..357b1270a3e 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds index 11f554606b3..3d01d408444 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds index b36241e4391..c22ace7b431 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds index 2dc4bfe36bf..b0c6573afd0 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds index 8f3c6e275c7..4036de96dea 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds index aa177cdd9c4..0894f51acb5 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds index ef1c2e2faec..ac9716b151d 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds index c4dcdf26169..42576564a78 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds index b3a5d5b691c..65fd417579b 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds index bec3fb0c825..72fb56675de 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds index ab6d8053d17..1fdc719c1bf 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds index 0f8e83c76de..35370ceea94 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds index 8b1d7787e9f..e8c1cc16eba 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds index 6effa72428c..5bbd2622220 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds index e914ef48855..e4685fb8780 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds index 5d69a46a15a..64218af7abd 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds index 70c1d6c6b5d..dec3f74f059 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds index ed393cb0a37..e0a2bd62868 100644 --- a/compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds b/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds index 98791a29dbb..b3338f2d3ef 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds index 9a062be9167..d91e89886b7 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.bounds +++ b/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> \ No newline at end of file +P=Consumer> diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds index a5d0d904597..e2c18c29f81 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds index 4394d6f956e..bffb550873a 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds index c76dbdb7182..842dc6ea2a4 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds index 01b0c37731c..17b2a13fe09 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducer.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds b/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds index c9f33c564c7..2d574cc3282 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds b/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds index 6b1a1f6daf0..c8f586e0643 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds index 379589a6bf2..14722a37620 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleFun.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds index 68700b96962..6f1826c443c 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds index 6e90c63a897..8dbddcf9c42 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds b/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds index 14fe73be6f7..9647fc7cf43 100644 --- a/compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds index b3a8ecb359c..ddc2b06e136 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds index 68d1b96ebeb..eba72e6eaf5 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds b/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds index 884500e81a7..cf7d6634fcd 100644 --- a/compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.bounds +++ b/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=??? \ No newline at end of file +T=??? diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds index 2bd66db1772..cf98cfe1213 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds index afa3652f02f..18ee276ac16 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds index c6d316d75d2..eb228db31bb 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds index 89a9dcf5f2e..f674e15203a 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds index 8c13f889136..a30bca567b7 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds index 59dc38abb16..56f9a03afcf 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds index 9c49f3eef8c..45500b013ed 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.bounds +++ b/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 diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds index 984211dd519..67b60d1479f 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds index 3303bd7f335..6fc17a3171a 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds index 2a54eaf7bef..3c66b80507d 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds index a2fedd419a4..749c66cfa9a 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds index 6ef6d2c6a5d..eb1157e8521 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds index 33f852ef188..e58fbc75207 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds index 8511989ba6b..04f286917b3 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds index 894de55e226..023ece28e13 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds index c52306a9b47..0885b3d60bc 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds index 6788c3c5227..ad45ed7c6db 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds index 0b499eab01c..d3157cb8c0e 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds index 121d0523caa..ecedf08544c 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds index dc29c6058dc..81a682e5ca7 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds index edd7c9937c2..8f22965c275 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds index 236d15a9bd6..e518963ba10 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: true -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: true -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds index 910cc6da5c6..5c15de74f7f 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds index 8388ad7a2ad..7aa3f6787f1 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds index ea1fff4a0f4..6dfc882fe47 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: true -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: true -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds index 7e3aa9c5a0e..39072b45d84 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds index 0cfdde90f94..631127ad0af 100644 --- a/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds +++ b/compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds index 31d0bbe9090..3d719cd2c9c 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds @@ -11,7 +11,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds index e17af150262..7290a18d89e 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds index 31d1e7cf1ad..c9d7700b5bc 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleEquality1.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds index 0e05381bf41..5c91ddf5be8 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: true -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds index 53e9e8a7941..35f2e2d172b 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds index 8580fda0452..806f684e0f6 100644 --- a/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds +++ b/compiler/testData/constraintSystem/severalVariables/simpleSubtype1.bounds @@ -12,7 +12,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/variance/consumer.bounds b/compiler/testData/constraintSystem/variance/consumer.bounds index f0c5d30a279..eb8ee755b49 100644 --- a/compiler/testData/constraintSystem/variance/consumer.bounds +++ b/compiler/testData/constraintSystem/variance/consumer.bounds @@ -10,7 +10,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/variance/invariant.bounds b/compiler/testData/constraintSystem/variance/invariant.bounds index 6e911a8ca3d..1012e4008c9 100644 --- a/compiler/testData/constraintSystem/variance/invariant.bounds +++ b/compiler/testData/constraintSystem/variance/invariant.bounds @@ -10,7 +10,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/constraintSystem/variance/producer.bounds b/compiler/testData/constraintSystem/variance/producer.bounds index cc230ad432e..e13388ee294 100644 --- a/compiler/testData/constraintSystem/variance/producer.bounds +++ b/compiler/testData/constraintSystem/variance/producer.bounds @@ -10,7 +10,7 @@ status: -hasConflictingConstraints: false -hasContradiction: false -hasErrorInConstrainingTypes: false --hasTypeConstructorMismatch: false +-hasParameterConstraintError: false -hasTypeInferenceIncorporationError: false -hasUnknownParameters: false -hasViolatedUpperBound: false diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt index 783a1951a2c..2337f8ca911 100644 --- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt +++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt @@ -42,10 +42,10 @@ fun main(args : Array) { joinG(1, "2") joinG(*1, "2") - joinG(1, *"2") + joinG(1, *"2") joinG(x = 1, a = *a) joinG(x = 1, a = "2") - joinG(x = *1, a = *"2") + joinG(x = *1, a = *"2") joinG(1, *a) joinG(1, *a, "3") joinG(1, "4", *a, "3") diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt index 6c7b9b17d6a..71fd0ed04cb 100644 --- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt +++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt @@ -9,7 +9,7 @@ class Foo { } fun main(args: Array) { - with("", { + with("", { Foo.findByName("") }) } diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt index 7ad420b84b1..39486a0a4b9 100644 --- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt +++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt @@ -6,9 +6,9 @@ fun foo(a: A) = a fun bar(f: (T) -> R) = f fun test() { - foo { it } - foo { x -> x} - foo { x: Int -> x} + foo { it } + foo { x -> x} + foo { x: Int -> x} bar { it + 1 } bar { x -> x + 1} diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt index 37f11cb1236..82e2ca5519e 100644 --- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt +++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt @@ -4,9 +4,9 @@ package typeConstructorMismatch import java.util.* fun test(set: Set) { - elemAndList("2", set) + elemAndList("2", set) - "".elemAndListWithReceiver("", set) + "".elemAndListWithReceiver("", set) } fun elemAndList(r: R, t: List): R = r diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt index a80068ed652..7831173206c 100644 --- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt +++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt @@ -28,7 +28,7 @@ fun test() { other(11) - otherGeneric(1) + otherGeneric(1) val r = either(1, "") r checkType { _>() } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt index d657c6bd3df..106a4194aed 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintError.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.Constrain open class ConstraintError(val constraintPosition: ConstraintPosition) -class TypeConstructorMismatch(constraintPosition: ConstraintPosition): ConstraintError(constraintPosition) +class ParameterConstraintError(constraintPosition: ConstraintPosition): ConstraintError(constraintPosition) class ErrorInConstrainingType(constraintPosition: ConstraintPosition): ConstraintError(constraintPosition) @@ -30,5 +30,5 @@ class TypeInferenceError(constraintPosition: ConstraintPosition): ConstraintErro class CannotCapture(constraintPosition: ConstraintPosition, val typeVariable: TypeParameterDescriptor): ConstraintError(constraintPosition) -fun newTypeInferenceOrConstructorMismatchError(constraintPosition: ConstraintPosition) = - if (constraintPosition.isParameter()) TypeConstructorMismatch(constraintPosition) else TypeInferenceError(constraintPosition) \ No newline at end of file +fun newTypeInferenceOrParameterConstraintError(constraintPosition: ConstraintPosition) = + if (constraintPosition.isParameter()) ParameterConstraintError(constraintPosition) else TypeInferenceError(constraintPosition) \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt index a568bac6795..c1e6393e37b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt @@ -81,7 +81,7 @@ public class ConstraintSystemImpl : ConstraintSystem { override fun isSuccessful() = !hasContradiction() && !hasUnknownParameters() - override fun hasContradiction() = hasTypeConstructorMismatch() || hasConflictingConstraints() + override fun hasContradiction() = hasParameterConstraintError() || hasConflictingConstraints() || hasCannotCaptureTypesError() || hasTypeInferenceIncorporationError() override fun hasViolatedUpperBound() = !isSuccessful() && filterConstraintsOut(TYPE_BOUND_POSITION).getStatus().isSuccessful() @@ -90,7 +90,7 @@ public class ConstraintSystemImpl : ConstraintSystem { override fun hasUnknownParameters() = localTypeParameterBounds.values().any { it.values.isEmpty() } - override fun hasTypeConstructorMismatch() = errors.any { it is TypeConstructorMismatch } + override fun hasParameterConstraintError() = errors.any { it is ParameterConstraintError } override fun hasOnlyErrorsDerivedFrom(kind: ConstraintPositionKind): Boolean { if (isSuccessful()) return false @@ -255,7 +255,7 @@ public class ConstraintSystemImpl : ConstraintSystem { } override fun noCorrespondingSupertype(subtype: JetType, supertype: JetType): Boolean { - errors.add(newTypeInferenceOrConstructorMismatchError(constraintPosition)) + errors.add(newTypeInferenceOrParameterConstraintError(constraintPosition)) return true } }) @@ -322,7 +322,7 @@ public class ConstraintSystemImpl : ConstraintSystem { else { typeCheckingProcedure.isSubtypeOf(subTypeNotNullable, superType) } - if (!result) errors.add(newTypeInferenceOrConstructorMismatchError(constraintPosition)) + if (!result) errors.add(newTypeInferenceOrParameterConstraintError(constraintPosition)) } if (topLevel) { storeInitialConstraint(constraintKind, subType, superType, constraintPosition) diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt index 458b8bcc0c3..2234da09b49 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemStatus.kt @@ -63,7 +63,7 @@ public trait ConstraintSystemStatus { * For example, for 
fun <R> foo(t: List<R>) {}
in invocation foo(hashSet("s")) * there is type constructor mismatch: "HashSet<String> cannot be a subtype of List<R>". */ - public fun hasTypeConstructorMismatch(): Boolean + public fun hasParameterConstraintError(): Boolean /** * Returns true if there is type constructor mismatch only in constraintPosition or diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java index f0ac21fd13e..21fc23f1c03 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java @@ -71,7 +71,7 @@ public class IdeErrorMessages { MAP.put(TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, "Type inference failed: {0}", HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER); MAP.put(TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, "Type inference failed: {0}", HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER); - MAP.put(TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH, "Type inference failed: {0}", HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER); + MAP.put(TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR, "Type inference failed: {0}", HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER); MAP.put(TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, tableForTypes("Type inference failed. Expected type mismatch: ", "required: ", TextElementType.STRONG, "found: ", TextElementType.ERROR), HTML_RENDER_TYPE, HTML_RENDER_TYPE); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt index 55647ab662b..21bdc38ae5d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt @@ -53,8 +53,8 @@ public object IdeRenderers { Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString() } - public val HTML_TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH_RENDERER: Renderer = Renderer { - Renderers.renderTypeConstructorMismatchError(it, HtmlTabledDescriptorRenderer.create()).toString() + public val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER: Renderer = Renderer { + Renderers.renderParameterConstraintError(it, HtmlTabledDescriptorRenderer.create()).toString() } public val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer = Renderer { diff --git a/idea/testData/diagnosticMessage/functionPlaceholder.kt b/idea/testData/diagnosticMessage/functionPlaceholder.kt index f26da6266d6..6528f3994ec 100644 --- a/idea/testData/diagnosticMessage/functionPlaceholder.kt +++ b/idea/testData/diagnosticMessage/functionPlaceholder.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS_NUMBER: 3 -// !DIAGNOSTICS: TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH +// !DIAGNOSTICS: TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR class A fun foo(a: A) = a diff --git a/idea/testData/diagnosticMessage/numberValueTypes.kt b/idea/testData/diagnosticMessage/numberValueTypes.kt index a5a7a2aefcf..2eaac514059 100644 --- a/idea/testData/diagnosticMessage/numberValueTypes.kt +++ b/idea/testData/diagnosticMessage/numberValueTypes.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS_NUMBER: 4 -// !DIAGNOSTICS: TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS +// !DIAGNOSTICS: TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS package a