diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt index 378c13a38b7..fa0b6e23ca7 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt @@ -1,7 +1,7 @@ //!DIAGNOSTICS: -UNUSED_VARIABLE @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun List<@Exact T>.firstTyped(): U = throw Exception() +fun List<@kotlin.internal.Exact T>.firstTyped(): U = throw Exception() fun test1(l: List) { diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt index 21fc9a0488f..1c63d70c5b0 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt @@ -1,13 +1,13 @@ //!DIAGNOSTICS: -UNUSED_PARAMETER @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun test1(t1: T, t2: @NoInfer T): T = t1 +fun test1(t1: T, t2: @kotlin.internal.NoInfer T): T = t1 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun @NoInfer T.test2(t1: T): T = t1 +fun @kotlin.internal.NoInfer T.test2(t1: T): T = t1 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun test3(t1: @NoInfer T): T = t1 +fun test3(t1: @kotlin.internal.NoInfer T): T = t1 fun usage() { test1(1, "312") @@ -16,14 +16,14 @@ fun usage() { } @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun List.contains1(e: @NoInfer T): Boolean = true +fun List.contains1(e: @kotlin.internal.NoInfer T): Boolean = true fun test(l: List) { l.contains1("") } @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -fun assertEquals1(e1: T, e2: @NoInfer T): Boolean = true +fun assertEquals1(e1: T, e2: @kotlin.internal.NoInfer T): Boolean = true fun test(s: String) { assertEquals1(s, 11) diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt index 61822b98360..76320be1df7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.resolve.descriptorUtil import org.jetbrains.kotlin.descriptors.annotations.Annotated import org.jetbrains.kotlin.name.FqName -private val NO_INFER_ANNOTATION_FQ_NAME = FqName("kotlin.NoInfer") +private val NO_INFER_ANNOTATION_FQ_NAME = FqName("kotlin.internal.NoInfer") public fun Annotated.hasNoInferAnnotation(): Boolean = annotations.findAnnotation(NO_INFER_ANNOTATION_FQ_NAME) != null -private val EXACT_ANNOTATION_FQ_NAME = FqName("kotlin.Exact") +private val EXACT_ANNOTATION_FQ_NAME = FqName("kotlin.internal.Exact") public fun Annotated.hasExactAnnotation(): Boolean = annotations.findAnnotation(EXACT_ANNOTATION_FQ_NAME) != null \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/util/Annotations.kt b/libraries/stdlib/src/kotlin/internal/Annotations.kt similarity index 97% rename from libraries/stdlib/src/kotlin/util/Annotations.kt rename to libraries/stdlib/src/kotlin/internal/Annotations.kt index 5a59a7d20b0..5b2aed72b40 100644 --- a/libraries/stdlib/src/kotlin/util/Annotations.kt +++ b/libraries/stdlib/src/kotlin/internal/Annotations.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin +package kotlin.internal /** * Specifies that the corresponding type should be ignored during type inference. diff --git a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt index 82ca5ac3c3d..29761fe790f 100644 --- a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt +++ b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt @@ -2,6 +2,7 @@ package kotlin.properties import kotlin.reflect.KProperty +import kotlin.internal.Exact /** * Returns the value of the property for the given object from this read-only map.