From f11cb277cdb9e14886d765231f2d884110ca73ef Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 11 Oct 2023 10:26:48 +0200 Subject: [PATCH] Remove obsolete `@OptIn(ExperimentalStdlibApi::class)` annotations They were added when `buildList`, `buildMap` and `buildSet` were experimental. ^KT-62510 --- .../kotlin/codegen/coroutines/ChangeBoxingMethodTransformer.kt | 1 - .../kotlin/diagnostics/LightTreePositioningStrategies.kt | 1 - .../org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt | 1 - compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt | 2 -- .../kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt | 1 - .../backend/jvm/MemoizedMultiFieldValueClassReplacements.kt | 1 - .../org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt | 1 - .../kotlin/load/java/structure/impl/classFiles/Annotations.kt | 1 - .../src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt | 1 - .../src/org/jetbrains/kotlin/descriptors/Visibilities.kt | 1 - 10 files changed, 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/ChangeBoxingMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/ChangeBoxingMethodTransformer.kt index a27e0ea3764..c743cb4e726 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/ChangeBoxingMethodTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/ChangeBoxingMethodTransformer.kt @@ -20,7 +20,6 @@ import org.jetbrains.org.objectweb.asm.tree.MethodNode private val BOXING_CLASS_INTERNAL_NAME = StandardNames.COROUTINES_JVM_INTERNAL_PACKAGE_FQ_NAME.child(Name.identifier("Boxing")).topLevelClassInternalName() -@OptIn(ExperimentalStdlibApi::class) object ChangeBoxingMethodTransformer : MethodTransformer() { private val wrapperToInternalBoxing: Map diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt index cc51a5f2184..6a5285439f8 100644 --- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt +++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt @@ -1154,7 +1154,6 @@ object LightTreePositioningStrategies { } } - @OptIn(ExperimentalStdlibApi::class) val COMMAS: LightTreePositioningStrategy = object : LightTreePositioningStrategy() { override fun mark( node: LighterASTNode, diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt index c30508cc696..569dbdbdbe5 100644 --- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt @@ -1015,7 +1015,6 @@ object PositioningStrategies { } } - @OptIn(ExperimentalStdlibApi::class) val COMMAS: PositioningStrategy = object : PositioningStrategy() { override fun mark(element: PsiElement): List { return buildList { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt index f70af59c2be..3aa1fe315ff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.kt @@ -227,7 +227,6 @@ internal abstract class WhenOnClassExhaustivenessChecker : WhenExhaustivenessChe } private object WhenOnEnumExhaustivenessChecker : WhenOnClassExhaustivenessChecker() { - @OptIn(ExperimentalStdlibApi::class) override fun getMissingCases( expression: KtWhenExpression, context: BindingContext, @@ -248,7 +247,6 @@ private object WhenOnEnumExhaustivenessChecker : WhenOnClassExhaustivenessChecke } internal object WhenOnSealedExhaustivenessChecker : WhenOnClassExhaustivenessChecker() { - @OptIn(ExperimentalStdlibApi::class) override fun getMissingCases( expression: KtWhenExpression, context: BindingContext, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt index aecf9ffb689..b2bae8049f5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt @@ -455,7 +455,6 @@ class ResolvedAtomCompleter( ) } - @OptIn(ExperimentalStdlibApi::class) private fun KotlinType.replaceFunctionTypeArgumentsByDescriptor(descriptor: CallableDescriptor) = when (descriptor) { is CallableMemberDescriptor -> { diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt index 4008abba421..446abe0df3b 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MemoizedMultiFieldValueClassReplacements.kt @@ -466,7 +466,6 @@ class MemoizedMultiFieldValueClassReplacements( } } - @OptIn(ExperimentalStdlibApi::class) private fun verifyStructureCompatibility( targetStructure: List, sourceStructure: List diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt index 6c64f3b83f8..0d7eb9200c3 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ScriptGenerator.kt @@ -43,7 +43,6 @@ import org.jetbrains.kotlin.resolve.calls.util.isSingleUnderscore import org.jetbrains.kotlin.utils.addIfNotNull internal class ScriptGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGeneratorExtension(declarationGenerator) { - @OptIn(ExperimentalStdlibApi::class) fun generateScriptDeclaration(ktScript: KtScript): IrDeclaration? { val descriptor = getOrFail(BindingContext.DECLARATION_TO_DESCRIPTOR, ktScript) as ScriptDescriptor diff --git a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt index a190a16be56..fd29e21efbe 100644 --- a/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt +++ b/compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt @@ -160,7 +160,6 @@ class BinaryJavaAnnotation private constructor( return annotationVisitor } - @OptIn(ExperimentalStdlibApi::class) private fun translatePath(path: TypePath) = buildList { for (i in 0 until path.length) { when (val step = path.getStep(i)) { diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt index 8f7dd4dc8db..8fdbc56a54b 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt @@ -12,7 +12,6 @@ data class Jsr305Settings( val migrationLevel: ReportLevel? = null, val userDefinedLevelForSpecificAnnotation: Map = emptyMap() ) { - @OptIn(ExperimentalStdlibApi::class) val description by lazy { buildList { add(globalLevel.description) diff --git a/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Visibilities.kt b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Visibilities.kt index d4fb425499a..79eb548ade6 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Visibilities.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Visibilities.kt @@ -52,7 +52,6 @@ object Visibilities { } } - @OptIn(ExperimentalStdlibApi::class) private val ORDERED_VISIBILITIES: Map = buildMap { put(PrivateToThis, 0) put(Private, 0)