removed ResolutionStatus.TYPE_INFERENCE_ERROR constant

This commit is contained in:
Svetlana Isakova
2012-11-02 18:25:28 +04:00
parent b5a3486131
commit a6f437d363
2 changed files with 2 additions and 4 deletions
@@ -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(
@@ -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
};