From 7c62d8ed83b294985e5b020022a7eef340fef2e8 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 2 Mar 2015 18:45:12 +0300 Subject: [PATCH] Minor. Unused declarations removed --- .../kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index f7e72290801..c4cadb8ce4f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -90,7 +90,6 @@ class LazyJavaTypeResolver( } private class LazyStarProjection( - c: LazyJavaResolverContext, val typeParameter: TypeParameterDescriptor, val attr: JavaTypeAttributes ) : TypeProjectionBase() { @@ -198,7 +197,7 @@ class LazyJavaTypeResolver( TypeProjectionImpl(projectionKind, KotlinBuiltIns.getInstance().getNullableAnyType()) } else - LazyStarProjection(c, parameter, attr) + LazyStarProjection(parameter, attr) } } if (isConstructorTypeParameter()) { @@ -229,7 +228,7 @@ class LazyJavaTypeResolver( is JavaWildcardType -> { val bound = javaType.getBound() if (bound == null) - LazyStarProjection(c, typeParameter, attr) + LazyStarProjection(typeParameter, attr) else { var projectionKind = if (javaType.isExtends()) OUT_VARIANCE else IN_VARIANCE if (projectionKind == typeParameter.getVariance()) { @@ -337,8 +336,6 @@ trait JavaTypeAttributes { val annotations: Annotations } -fun JavaTypeAttributes.isFlexible() = flexibility != INFLEXIBLE - enum class JavaTypeFlexibility { INFLEXIBLE FLEXIBLE_UPPER_BOUND