From b35c571a23435e61a829337971e211dc35dad6f4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 8 Apr 2022 08:30:19 +0300 Subject: [PATCH] Remove deprecated sequence and iterator builders They were originally provided for migration from experimental coroutines #KT-26678 --- libraries/stdlib/api/js-v1/kotlin.sequences.kt | 17 +---------------- libraries/stdlib/api/js/kotlin.sequences.kt | 17 +---------------- .../src/kotlin/collections/SequenceBuilder.kt | 13 ------------- 3 files changed, 2 insertions(+), 45 deletions(-) diff --git a/libraries/stdlib/api/js-v1/kotlin.sequences.kt b/libraries/stdlib/api/js-v1/kotlin.sequences.kt index 6a844af4d5a..4e002202c85 100644 --- a/libraries/stdlib/api/js-v1/kotlin.sequences.kt +++ b/libraries/stdlib/api/js-v1/kotlin.sequences.kt @@ -1,18 +1,6 @@ @kotlin.internal.InlineOnly public inline fun Sequence(crossinline iterator: () -> kotlin.collections.Iterator): kotlin.sequences.Sequence -@kotlin.SinceKotlin(version = "1.3") -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'iterator { }' function instead.", replaceWith = kotlin.ReplaceWith(expression = "iterator(builderAction)", imports = {})) -@kotlin.internal.InlineOnly -public inline fun buildIterator(@kotlin.BuilderInference -noinline builderAction: suspend kotlin.sequences.SequenceScope.() -> kotlin.Unit): kotlin.collections.Iterator - -@kotlin.SinceKotlin(version = "1.3") -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'sequence { }' function instead.", replaceWith = kotlin.ReplaceWith(expression = "sequence(builderAction)", imports = {})) -@kotlin.internal.InlineOnly -public inline fun buildSequence(@kotlin.BuilderInference -noinline builderAction: suspend kotlin.sequences.SequenceScope.() -> kotlin.Unit): kotlin.sequences.Sequence - public fun emptySequence(): kotlin.sequences.Sequence public fun generateSequence(nextFunction: () -> T?): kotlin.sequences.Sequence @@ -627,7 +615,4 @@ public abstract class SequenceScope { public abstract suspend fun yieldAll(iterator: kotlin.collections.Iterator): kotlin.Unit public final suspend fun yieldAll(sequence: kotlin.sequences.Sequence): kotlin.Unit -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use SequenceScope class instead.", replaceWith = kotlin.ReplaceWith(expression = "SequenceScope", imports = {})) -public typealias SequenceBuilder = kotlin.sequences.SequenceScope \ No newline at end of file +} \ No newline at end of file diff --git a/libraries/stdlib/api/js/kotlin.sequences.kt b/libraries/stdlib/api/js/kotlin.sequences.kt index 6a844af4d5a..4e002202c85 100644 --- a/libraries/stdlib/api/js/kotlin.sequences.kt +++ b/libraries/stdlib/api/js/kotlin.sequences.kt @@ -1,18 +1,6 @@ @kotlin.internal.InlineOnly public inline fun Sequence(crossinline iterator: () -> kotlin.collections.Iterator): kotlin.sequences.Sequence -@kotlin.SinceKotlin(version = "1.3") -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'iterator { }' function instead.", replaceWith = kotlin.ReplaceWith(expression = "iterator(builderAction)", imports = {})) -@kotlin.internal.InlineOnly -public inline fun buildIterator(@kotlin.BuilderInference -noinline builderAction: suspend kotlin.sequences.SequenceScope.() -> kotlin.Unit): kotlin.collections.Iterator - -@kotlin.SinceKotlin(version = "1.3") -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'sequence { }' function instead.", replaceWith = kotlin.ReplaceWith(expression = "sequence(builderAction)", imports = {})) -@kotlin.internal.InlineOnly -public inline fun buildSequence(@kotlin.BuilderInference -noinline builderAction: suspend kotlin.sequences.SequenceScope.() -> kotlin.Unit): kotlin.sequences.Sequence - public fun emptySequence(): kotlin.sequences.Sequence public fun generateSequence(nextFunction: () -> T?): kotlin.sequences.Sequence @@ -627,7 +615,4 @@ public abstract class SequenceScope { public abstract suspend fun yieldAll(iterator: kotlin.collections.Iterator): kotlin.Unit public final suspend fun yieldAll(sequence: kotlin.sequences.Sequence): kotlin.Unit -} - -@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use SequenceScope class instead.", replaceWith = kotlin.ReplaceWith(expression = "SequenceScope", imports = {})) -public typealias SequenceBuilder = kotlin.sequences.SequenceScope \ No newline at end of file +} \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt index ba6d7150015..cdd6334f583 100644 --- a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt +++ b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt @@ -24,11 +24,6 @@ import kotlin.experimental.ExperimentalTypeInference @SinceKotlin("1.3") public fun sequence(@BuilderInference block: suspend SequenceScope.() -> Unit): Sequence = Sequence { iterator(block) } -@SinceKotlin("1.3") -@Deprecated("Use 'sequence { }' function instead.", ReplaceWith("sequence(builderAction)"), level = DeprecationLevel.ERROR) -@kotlin.internal.InlineOnly -public inline fun buildSequence(@BuilderInference noinline builderAction: suspend SequenceScope.() -> Unit): Sequence = Sequence { iterator(builderAction) } - /** * Builds an [Iterator] lazily yielding values one by one. * @@ -42,11 +37,6 @@ public fun iterator(@BuilderInference block: suspend SequenceScope.() -> return iterator } -@SinceKotlin("1.3") -@Deprecated("Use 'iterator { }' function instead.", ReplaceWith("iterator(builderAction)"), level = DeprecationLevel.ERROR) -@kotlin.internal.InlineOnly -public inline fun buildIterator(@BuilderInference noinline builderAction: suspend SequenceScope.() -> Unit): Iterator = iterator(builderAction) - /** * The scope for yielding values of a [Sequence] or an [Iterator], provides [yield] and [yieldAll] suspension functions. * @@ -100,9 +90,6 @@ public abstract class SequenceScope internal constructor() { public suspend fun yieldAll(sequence: Sequence) = yieldAll(sequence.iterator()) } -@Deprecated("Use SequenceScope class instead.", ReplaceWith("SequenceScope"), level = DeprecationLevel.ERROR) -public typealias SequenceBuilder = SequenceScope - private typealias State = Int private const val State_NotReady: State = 0