azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Unused declarations removed

Browse Source
This commit is contained in:
Andrey Breslav
2015-03-02 18:45:12 +03:00
parent e0b7e4efca
commit 7c62d8ed83
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+2 -5
View File
@@ -90,7 +90,6 @@ class LazyJavaTypeResolver(
} }
private class LazyStarProjection( private class LazyStarProjection(
c: LazyJavaResolverContext,
val typeParameter: TypeParameterDescriptor, val typeParameter: TypeParameterDescriptor,
val attr: JavaTypeAttributes val attr: JavaTypeAttributes
) : TypeProjectionBase() { ) : TypeProjectionBase() {
@@ -198,7 +197,7 @@ class LazyJavaTypeResolver(
TypeProjectionImpl(projectionKind, KotlinBuiltIns.getInstance().getNullableAnyType()) TypeProjectionImpl(projectionKind, KotlinBuiltIns.getInstance().getNullableAnyType())
} }
else else
LazyStarProjection(c, parameter, attr) LazyStarProjection(parameter, attr)
} }
} }
if (isConstructorTypeParameter()) { if (isConstructorTypeParameter()) {
@@ -229,7 +228,7 @@ class LazyJavaTypeResolver(
is JavaWildcardType -> { is JavaWildcardType -> {
val bound = javaType.getBound() val bound = javaType.getBound()
if (bound == null) if (bound == null)
LazyStarProjection(c, typeParameter, attr) LazyStarProjection(typeParameter, attr)
else { else {
var projectionKind = if (javaType.isExtends()) OUT_VARIANCE else IN_VARIANCE var projectionKind = if (javaType.isExtends()) OUT_VARIANCE else IN_VARIANCE
if (projectionKind == typeParameter.getVariance()) { if (projectionKind == typeParameter.getVariance()) {
@@ -337,8 +336,6 @@ trait JavaTypeAttributes {
val annotations: Annotations val annotations: Annotations
} }
fun JavaTypeAttributes.isFlexible() = flexibility != INFLEXIBLE
enum class JavaTypeFlexibility { enum class JavaTypeFlexibility {
INFLEXIBLE INFLEXIBLE
FLEXIBLE_UPPER_BOUND FLEXIBLE_UPPER_BOUND