From d7baef3f8dd9b1d95d033032c0ed0a18ecb25406 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 7 Sep 2015 12:44:08 +0300 Subject: [PATCH] Revert bf38f56261fdb755a9717464e5ad7ea04412f5bc --- compiler/testData/builtin-classes.txt | 2 +- core/builtins/src/kotlin/Annotations.kt | 2 +- core/builtins/src/kotlin/reflect/_Deprecated.kt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 54390b2a61c..ecc4f1ca5a0 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -1274,7 +1274,7 @@ kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) ko /*primary*/ public constructor noinline() } -kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailRecursive : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.Deprecated(replaceWith = kotlin.ReplaceWith(expression = "kotlin.tailrec", imports = {}), value = "Use kotlin.tailrec instead") kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailRecursive : kotlin.Annotation { /*primary*/ public constructor tailRecursive() } diff --git a/core/builtins/src/kotlin/Annotations.kt b/core/builtins/src/kotlin/Annotations.kt index 268e4b816ba..3a92a315e52 100644 --- a/core/builtins/src/kotlin/Annotations.kt +++ b/core/builtins/src/kotlin/Annotations.kt @@ -82,7 +82,7 @@ public annotation class Suppress(vararg val names: String) * backend. */ @Target(FUNCTION) -// @deprecated("Use kotlin.tailrec instead", ReplaceWith("kotlin.tailrec")) +@Deprecated("Use kotlin.tailrec instead", ReplaceWith("kotlin.tailrec")) @Retention(SOURCE) public annotation class tailRecursive diff --git a/core/builtins/src/kotlin/reflect/_Deprecated.kt b/core/builtins/src/kotlin/reflect/_Deprecated.kt index 58fceecfb33..ef5ea9b0d75 100644 --- a/core/builtins/src/kotlin/reflect/_Deprecated.kt +++ b/core/builtins/src/kotlin/reflect/_Deprecated.kt @@ -16,14 +16,14 @@ package kotlin.reflect -// @deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") +@Deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") public interface KTopLevelFunction : KFunction -// @deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") +@Deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") public interface KTopLevelExtensionFunction -// @deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") +@Deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") public interface KMemberFunction : KFunction -// @deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") +@Deprecated("This class will be dropped in M13 because it was a part of an overly complex API. Use KFunction instead") public interface KLocalFunction : KFunction