From 08dd675fcd26179d9198940fca38fb7efc070320 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 25 Jan 2016 13:56:35 +0300 Subject: [PATCH] Minor. Drop unused property --- .../kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt | 3 --- .../src/org/jetbrains/kotlin/types/TypeCapabilities.kt | 3 --- 2 files changed, 6 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 d5210e93a64..ea16346cdf2 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 @@ -275,9 +275,6 @@ class LazyJavaTypeResolver( override val isTypeVariable: Boolean = lowerBound.getConstructor() == upperBound.getConstructor() && lowerBound.getConstructor().getDeclarationDescriptor() is TypeParameterDescriptor - override val typeParameterDescriptor: TypeParameterDescriptor? = - if (isTypeVariable) lowerBound.getConstructor().getDeclarationDescriptor() as TypeParameterDescriptor else null - override fun substitutionResult(replacement: KotlinType): KotlinType { return if (replacement.isFlexible()) replacement else create(replacement, TypeUtils.makeNullable(replacement)) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt index 9f0192847cb..ab59ec87abf 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt @@ -66,9 +66,6 @@ fun oneMoreSpecificThanAnother(a: KotlinType, b: KotlinType) = interface CustomTypeVariable : TypeCapability { val isTypeVariable: Boolean - // If typeParameterDescriptor != null <=> isTypeVariable == true, this is not a type variable - val typeParameterDescriptor: TypeParameterDescriptor? - // Throws an exception when isTypeVariable == false fun substitutionResult(replacement: KotlinType): KotlinType }