From b87958d04a59c48daa27d7e9f1ee55ef50977b07 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Thu, 24 Aug 2023 14:09:55 +0200 Subject: [PATCH] Cleanup: drop unused ExpectActualCompatibility.Incompatible.Unknown --- .../kotlin/diagnostics/ClassicPositioningStrategies.kt | 2 +- .../kotlin/resolve/multiplatform/ExpectActualCompatibility.kt | 2 -- .../kotlin/resolve/multiplatform/ExpectActualMemberDiff.kt | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ClassicPositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ClassicPositioningStrategies.kt index a8ad9872f56..c7645b94212 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ClassicPositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/ClassicPositioningStrategies.kt @@ -49,7 +49,7 @@ object ClassicPositioningStrategies { val callableDeclaration = element as? KtCallableDeclaration val incompatibility = diagnostic.firstIncompatibility return when (incompatibility) { - null, ExpectActualCompatibility.Incompatible.Unknown, is ExpectActualCompatibility.Incompatible.ClassScopes, + null, is ExpectActualCompatibility.Incompatible.ClassScopes, ExpectActualCompatibility.Incompatible.EnumEntries -> null ExpectActualCompatibility.Incompatible.ClassKind -> { val startElement = diff --git a/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualCompatibility.kt b/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualCompatibility.kt index 1af72225fb8..0fd28746597 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualCompatibility.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualCompatibility.kt @@ -94,8 +94,6 @@ sealed class ExpectActualCompatibility { object TypeParameterReified : WeakIncompatible( "some type parameter is reified in one declaration and non-reified in the other" ) - - object Unknown : WeakIncompatible(null) } object Compatible : ExpectActualCompatibility() diff --git a/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualMemberDiff.kt b/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualMemberDiff.kt index 3601db23b65..987c779a9b3 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualMemberDiff.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectActualMemberDiff.kt @@ -86,7 +86,6 @@ private fun ExpectActualCompatibility.Incompatible<*>.toDiffKind(): ExpectActual ExpectActualCompatibility.Incompatible.TypeParameterNames -> ExpectActualMemberDiff.Kind.TypeParameterNamesChangedInOverride ExpectActualCompatibility.Incompatible.TypeParameterReified -> null // inline fun can't be overridden ExpectActualCompatibility.Incompatible.TypeParameterVariance -> null // Members are not allowed to have variance - ExpectActualCompatibility.Incompatible.Unknown -> null // Unknown incompatibility is never reported ExpectActualCompatibility.Incompatible.ValueParameterCrossinline -> null // inline fun can't be overridden ExpectActualCompatibility.Incompatible.ValueParameterNoinline -> null // inline fun can't be overridden ExpectActualCompatibility.Incompatible.ValueParameterVararg -> ExpectActualMemberDiff.Kind.NonPrivateCallableAdded