diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt index 5a6ba02cc92..36d5a357534 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.kt @@ -1,4 +1,4 @@ -fun foo(@BuilderInference block: MutableList.() -> Unit): T = null!! +fun foo(@BuilderInference block: MutableList.() -> Unit): T = null!! fun takeString(s: String) {} diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt index e21fc1cd012..24b0e564137 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt @@ -12,7 +12,7 @@ fun test_2() { takeList(list) } -fun myBuildList(@BuilderInference builderAction: MutableList.() -> Unit): List { +fun myBuildList(@BuilderInference builderAction: MutableList.() -> Unit): List { return ArrayList().apply(builderAction) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt index 93a49969839..8957b783f92 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KtFirCompositeScope.kt @@ -2,7 +2,7 @@ interface KtScope { fun getAllNames(): Set } -inline fun buildSet(@BuilderInference builderAction: MutableSet.() -> Unit): Set { +inline fun buildSet(@BuilderInference builderAction: MutableSet.() -> Unit): Set { return null!! } diff --git a/libraries/stdlib/api/js-v1/kotlin.kt b/libraries/stdlib/api/js-v1/kotlin.kt index d60f7ebefe3..b74ef02ec44 100644 --- a/libraries/stdlib/api/js-v1/kotlin.kt +++ b/libraries/stdlib/api/js-v1/kotlin.kt @@ -970,8 +970,6 @@ public final class BooleanArray { @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.3") @kotlin.experimental.ExperimentalTypeInference -@kotlin.Deprecated(message = "BuilderInference annotation may not be used anymore. The builder inference is enabled automatically for builder calls if needed") -@kotlin.DeprecatedSinceKotlin(errorSince = "1.9", hiddenSince = "1.10", warningSince = "1.7") public final annotation class BuilderInference : kotlin.Annotation { public constructor BuilderInference() } diff --git a/libraries/stdlib/api/js/kotlin.kt b/libraries/stdlib/api/js/kotlin.kt index b24778c4c98..62526c38e9e 100644 --- a/libraries/stdlib/api/js/kotlin.kt +++ b/libraries/stdlib/api/js/kotlin.kt @@ -921,8 +921,6 @@ public final class BooleanArray { @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) @kotlin.SinceKotlin(version = "1.3") @kotlin.experimental.ExperimentalTypeInference -@kotlin.Deprecated(message = "BuilderInference annotation may not be used anymore. The builder inference is enabled automatically for builder calls if needed") -@kotlin.DeprecatedSinceKotlin(errorSince = "1.9", hiddenSince = "1.10", warningSince = "1.7") public final annotation class BuilderInference : kotlin.Annotation { public constructor BuilderInference() } diff --git a/libraries/stdlib/src/kotlin/annotations/Inference.kt b/libraries/stdlib/src/kotlin/annotations/Inference.kt index e670726646b..bb40746481d 100644 --- a/libraries/stdlib/src/kotlin/annotations/Inference.kt +++ b/libraries/stdlib/src/kotlin/annotations/Inference.kt @@ -34,8 +34,6 @@ import kotlin.experimental.ExperimentalTypeInference @Retention(AnnotationRetention.BINARY) @SinceKotlin("1.3") @ExperimentalTypeInference -@Deprecated("BuilderInference annotation may not be used anymore. The builder inference is enabled automatically for builder calls if needed") -@DeprecatedSinceKotlin(warningSince = "1.7", errorSince = "1.9", hiddenSince = "1.10") public annotation class BuilderInference