Drop RawTypeMarker as it's effectively unused anymore

See the previous commits
This commit is contained in:
Denis.Zharkov
2023-02-24 13:01:01 +01:00
committed by Space Team
parent 608cb01935
commit a3dcc2032f
4 changed files with 3 additions and 6 deletions
@@ -184,7 +184,7 @@ data class ConeDefinitelyNotNullType(val original: ConeSimpleKotlinType) : ConeS
class ConeRawType private constructor( class ConeRawType private constructor(
lowerBound: ConeSimpleKotlinType, lowerBound: ConeSimpleKotlinType,
upperBound: ConeSimpleKotlinType upperBound: ConeSimpleKotlinType
) : ConeFlexibleType(lowerBound, upperBound), RawTypeMarker { ) : ConeFlexibleType(lowerBound, upperBound) {
companion object { companion object {
fun create( fun create(
lowerBound: ConeSimpleKotlinType, lowerBound: ConeSimpleKotlinType,
@@ -143,7 +143,7 @@ abstract class AbstractTypeApproximator(
val lowerResult = approximateTo(lowerBound, conf, depth) val lowerResult = approximateTo(lowerBound, conf, depth)
val upperResult = if (type !is RawTypeMarker && lowerBound.typeConstructor() == upperBound.typeConstructor()) val upperResult = if (!type.isRawType() && lowerBound.typeConstructor() == upperBound.typeConstructor())
lowerResult?.withNullability(upperBound.isMarkedNullable()) lowerResult?.withNullability(upperBound.isMarkedNullable())
else else
approximateTo(upperBound, conf, depth) approximateTo(upperBound, conf, depth)
@@ -23,7 +23,6 @@ interface DefinitelyNotNullTypeMarker : SimpleTypeMarker
interface FlexibleTypeMarker : KotlinTypeMarker interface FlexibleTypeMarker : KotlinTypeMarker
interface DynamicTypeMarker : FlexibleTypeMarker interface DynamicTypeMarker : FlexibleTypeMarker
interface RawTypeMarker : FlexibleTypeMarker
interface StubTypeMarker : SimpleTypeMarker interface StubTypeMarker : SimpleTypeMarker
interface TypeArgumentListMarker interface TypeArgumentListMarker
@@ -16,6 +16,4 @@
package org.jetbrains.kotlin.types package org.jetbrains.kotlin.types
import org.jetbrains.kotlin.types.model.RawTypeMarker interface RawType
interface RawType : RawTypeMarker