From a3755a8e94bae293b1e6c2ba094ea2ae7d0958b4 Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Thu, 30 Sep 2021 23:17:21 +0300 Subject: [PATCH] @UseExperimental -> @OptIn in compiler testData --- .../inference/builderInference/commonSuperType.kt | 2 +- .../builderInference/commonSuperTypeCovariant.kt | 2 +- .../builderInference/commonSuperTypeInvariant.kt | 2 +- .../builderInference/commonSuperTypeNullable.kt | 2 +- .../box/inference/builderInference/labaledCall.kt | 2 +- .../box/inference/builderInference/memberScope.kt | 2 +- .../box/inference/builderInference/nullability.kt | 2 +- .../inference/builderInference/withExpectedType.kt | 14 +++++++------- ...changingResolveIfDontUseBuilderInference.fir.kt | 4 ++-- .../changingResolveIfDontUseBuilderInference.kt | 4 ++-- .../changingResolveIfDontUseBuilderInference.txt | 2 +- .../stubTypes/commonSuperType.fir.kt | 10 +++++----- .../builderInference/stubTypes/commonSuperType.kt | 6 +++--- .../builderInference/stubTypes/commonSuperType.txt | 4 ++-- .../stubTypes/commonSuperTypeCovariant.fir.kt | 10 +++++----- .../stubTypes/commonSuperTypeCovariant.kt | 6 +++--- .../stubTypes/commonSuperTypeCovariant.txt | 4 ++-- .../stubTypes/commonSuperTypeNullable.fir.kt | 10 +++++----- .../stubTypes/commonSuperTypeNullable.kt | 6 +++--- .../stubTypes/commonSuperTypeNullable.txt | 4 ++-- 20 files changed, 49 insertions(+), 49 deletions(-) diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt index 3e4be2efffd..0a1d7ad5f6d 100644 --- a/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt +++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperType.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt index 2dd1b06f039..0639e01d8e7 100644 --- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt +++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeCovariant.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // TARGET_BACKEND: JVM // IGNORE_BACKEND: WASM diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt index 0ec4c1acb74..093586339b8 100644 --- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt +++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeInvariant.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // IGNORE_BACKEND: WASM // TARGET_BACKEND: JVM diff --git a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt index 446efc81d3f..50fb81e3298 100644 --- a/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt +++ b/compiler/testData/codegen/box/inference/builderInference/commonSuperTypeNullable.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // TARGET_BACKEND: JVM // IGNORE_BACKEND: WASM diff --git a/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt b/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt index dffa6b8d7d5..43348f0d93b 100644 --- a/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt +++ b/compiler/testData/codegen/box/inference/builderInference/labaledCall.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -UNCHECKED_CAST -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -UNCHECKED_CAST -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: main.kt diff --git a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt index 58f237ee831..c477ba76ffb 100644 --- a/compiler/testData/codegen/box/inference/builderInference/memberScope.kt +++ b/compiler/testData/codegen/box/inference/builderInference/memberScope.kt @@ -10,7 +10,7 @@ interface TestInterface { fun get(): R } -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build(@BuilderInference block: TestInterface.() -> Unit) {} fun Any.test() {} diff --git a/compiler/testData/codegen/box/inference/builderInference/nullability.kt b/compiler/testData/codegen/box/inference/builderInference/nullability.kt index 5f6488a2fc3..ad9198f77e0 100644 --- a/compiler/testData/codegen/box/inference/builderInference/nullability.kt +++ b/compiler/testData/codegen/box/inference/builderInference/nullability.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -DEPRECATION -OPT_IN_IS_NOT_ENABLED +// !DIAGNOSTICS: -OPT_IN_IS_NOT_ENABLED // WITH_RUNTIME // FILE: main.kt diff --git a/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt b/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt index 1d679b0142e..ebdcff4a5ed 100644 --- a/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt +++ b/compiler/testData/codegen/box/inference/builderInference/withExpectedType.kt @@ -7,25 +7,25 @@ import kotlin.experimental.ExperimentalTypeInference fun id(x: K): K = x -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build(@BuilderInference builderAction: MutableMap.() -> V) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build2(@BuilderInference builderAction: MutableMap.() -> K) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build3(@BuilderInference builderAction: MutableMap.(K) -> Unit) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build4(@BuilderInference builderAction: MutableMap.() -> MutableMap) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build5(@BuilderInference builderAction: MutableMap.() -> MutableMap) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build6(@BuilderInference builderAction: MutableMap.() -> MutableMap) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build7(@BuilderInference builderAction: MutableMap.() -> MutableMap) = mutableMapOf() @ExperimentalStdlibApi diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt index 47bbb72aec9..7a69400289e 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.fir.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// !DIAGNOSTICS: -OPT_IN_IS_NOT_ENABLED -DEPRECATION -OPT_IN_USAGE_ERROR +// !DIAGNOSTICS: -OPT_IN_IS_NOT_ENABLED -OPT_IN_USAGE_ERROR // IGNORE_BACKEND: WASM import kotlin.experimental.ExperimentalTypeInference @@ -11,7 +11,7 @@ fun foo(): MutableMap = mutableMapOf() fun MutableMap.swap(x: MutableMap) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build7(@BuilderInference builderAction: MutableMap.() -> MutableMap) = mutableMapOf() fun id(x: K): K = x diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt index 6bdaaf63fc9..9666468ea15 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.kt @@ -1,5 +1,5 @@ // WITH_RUNTIME -// !DIAGNOSTICS: -OPT_IN_IS_NOT_ENABLED -DEPRECATION -OPT_IN_USAGE_ERROR +// !DIAGNOSTICS: -OPT_IN_IS_NOT_ENABLED -OPT_IN_USAGE_ERROR // IGNORE_BACKEND: WASM import kotlin.experimental.ExperimentalTypeInference @@ -11,7 +11,7 @@ fun foo(): MutableMap = mutableMapOf() fun MutableMap.swap(x: MutableMap) {} -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build7(@BuilderInference builderAction: MutableMap.() -> MutableMap) = mutableMapOf() fun id(x: K): K = x diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt index 5556b61d1d8..169138939d9 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/changingResolveIfDontUseBuilderInference.txt @@ -1,6 +1,6 @@ package -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build7(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableMap.() -> kotlin.collections.MutableMap): kotlin.collections.MutableMap +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build7(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableMap.() -> kotlin.collections.MutableMap): kotlin.collections.MutableMap @kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun buildMap(/*0*/ @kotlin.BuilderInference builderAction: kotlin.collections.MutableMap.() -> kotlin.Unit): kotlin.collections.Map public fun foo(): kotlin.collections.MutableMap public fun id(/*0*/ x: K): K diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt index 44cb5587b58..b04ab20dda4 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -11,11 +11,11 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) -fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() -@UseExperimental(ExperimentalTypeInference::class) -fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() class Inv diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt index ef094ed5717..463f72fdaa3 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -11,10 +11,10 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() class Inv diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt index fdf2c29c0dd..f28de25d7cf 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.txt @@ -1,7 +1,7 @@ package -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R public fun id(/*0*/ x: U): U public fun select(/*0*/ vararg x: E /*kotlin.Array*/): E public fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt index 34574826e2e..0fb9465fae5 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -11,11 +11,11 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) -fun build(@BuilderInference block: TestInterface.() -> Unit): R1 = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build(@BuilderInference block: TestInterface.() -> Unit): R1 = TODO() -@UseExperimental(ExperimentalTypeInference::class) -fun build2(@BuilderInference block: TestInterface.() -> Unit): R2 = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build2(@BuilderInference block: TestInterface.() -> Unit): R2 = TODO() class Out diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt index ac7f110fe4e..27343008dbd 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -11,10 +11,10 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build(@BuilderInference block: TestInterface.() -> Unit): R1 = TODO() -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build2(@BuilderInference block: TestInterface.() -> Unit): R2 = TODO() class Out diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt index c45431f64e7..c88f9be0ef7 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.txt @@ -1,7 +1,7 @@ package -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R1 -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R2 +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R1 +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R2 public fun id(/*0*/ x: U): U? public fun select1(/*0*/ x: E, /*1*/ y: Out): E? public fun select2(/*0*/ x: E, /*1*/ y: Out): E diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt index 7e20715bf1e..0b3a92398e3 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -14,11 +14,11 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) -fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() -@UseExperimental(ExperimentalTypeInference::class) -fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() +@OptIn(ExperimentalTypeInference::class) +fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() class Inv diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt index ae36f07debc..8335d8302c2 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt @@ -1,5 +1,5 @@ // !LANGUAGE: +UnrestrictedBuilderInference -// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE +// !DIAGNOSTICS: -UNUSED_PARAMETER -OPT_IN_IS_NOT_ENABLED -UNUSED_VARIABLE // WITH_RUNTIME // FILE: Test.java @@ -14,10 +14,10 @@ class Test { // FILE: main.kt import kotlin.experimental.ExperimentalTypeInference -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build(@BuilderInference block: TestInterface.() -> Unit): R = TODO() -@UseExperimental(ExperimentalTypeInference::class) +@OptIn(ExperimentalTypeInference::class) fun build2(@BuilderInference block: TestInterface.() -> Unit): R = TODO() class Inv diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt index 68ad8178487..a50e79c8f8d 100644 --- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt +++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.txt @@ -1,7 +1,7 @@ package -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R -@kotlin.UseExperimental(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R +@kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun build2(/*0*/ @kotlin.BuilderInference block: TestInterface.() -> kotlin.Unit): R public fun id(/*0*/ x: U): U? public fun select(/*0*/ vararg x: E /*kotlin.Array*/): E? public fun test(): kotlin.Unit