From a6f437d3636940cd92d2d83cdca78f5233f8640b Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 2 Nov 2012 18:25:28 +0400
Subject: [PATCH] removed ResolutionStatus.TYPE_INFERENCE_ERROR constant

---
 .../jetbrains/jet/lang/resolve/calls/CandidateResolver.java   | 4 ++--
 .../jet/lang/resolve/calls/results/ResolutionStatus.java      | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
index 5bf98cac152..be9e37cae2e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
@@ -246,7 +246,7 @@ public class CandidateResolver {
                                                         .create(descriptor, constraintSystem, argumentTypes, receiverType,
                                                                 context.expectedType),
                                                 constraintSystemWithoutExpectedTypeConstraint);
-            resolvedCall.addStatus(ResolutionStatus.TYPE_INFERENCE_ERROR);
+            resolvedCall.addStatus(ResolutionStatus.OTHER_ERROR);
             failed.add(resolvedCall);
             return;
         }
@@ -351,7 +351,7 @@ public class CandidateResolver {
         else {
             context.tracing.upperBoundViolated(candidateCall.getTrace(), inferenceErrorData);
         }
-        return TYPE_INFERENCE_ERROR.combine(argumentsStatus);
+        return OTHER_ERROR.combine(argumentsStatus);
     }
 
     private void addConstraintForValueArgument(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java
index 5f554b5d6f0..aca2a2dc7ad 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java
@@ -26,13 +26,11 @@ public enum ResolutionStatus {
     UNSAFE_CALL_ERROR,
     OTHER_ERROR,
     STRONG_ERROR,
-    TYPE_INFERENCE_ERROR, //todo remove
     SUCCESS(true);
 
     @SuppressWarnings("unchecked")
     public static final EnumSet<ResolutionStatus>[] SEVERITY_LEVELS = new EnumSet[] {
             EnumSet.of(UNSAFE_CALL_ERROR), // weakest
-            EnumSet.of(TYPE_INFERENCE_ERROR),
             EnumSet.of(OTHER_ERROR),
             EnumSet.of(STRONG_ERROR), // most severe
     };