From 991b4251f337005a11144d3976dc7fc1cb0a82ee Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Mon, 16 Jul 2018 20:44:41 +0300 Subject: [PATCH] Remove redundant RequireKotlin annotations from coroutines' stdlib. --- .../stdlib/coroutines/src/kotlin/coroutines/Continuation.kt | 1 - .../coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt | 1 - .../stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt | 4 ---- 3 files changed, 6 deletions(-) diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt b/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt index 65a722a24d4..90cea0091b6 100644 --- a/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt +++ b/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt @@ -138,7 +138,6 @@ public fun (suspend R.() -> T).startCoroutine( */ @SinceKotlin("1.3") @InlineOnly -@kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public suspend inline fun suspendCoroutine(crossinline block: (Continuation) -> Unit): T = suspendCoroutineUninterceptedOrReturn { c: Continuation -> val safe = SafeContinuation(c.intercepted()) diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt b/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt index 7b268330496..8a8e45a2901 100644 --- a/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt +++ b/libraries/stdlib/coroutines/src/kotlin/coroutines/intrinsics/Intrinsics.kt @@ -37,7 +37,6 @@ import kotlin.internal.InlineOnly */ @SinceKotlin("1.3") @InlineOnly -@kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public suspend inline fun suspendCoroutineUninterceptedOrReturn(crossinline block: (Continuation) -> Any?): T = throw NotImplementedError("Implementation of suspendCoroutineUninterceptedOrReturn is intrinsic") diff --git a/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt b/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt index addcdd0ab36..61e49dca71f 100644 --- a/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt +++ b/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt @@ -55,7 +55,6 @@ public abstract class SequenceBuilder internal constructor() { * @sample samples.collections.Sequences.Building.buildSequenceYieldAll * @sample samples.collections.Sequences.Building.buildFibonacciSequence */ - @kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public abstract suspend fun yield(value: T) /** @@ -65,7 +64,6 @@ public abstract class SequenceBuilder internal constructor() { * * @sample samples.collections.Sequences.Building.buildSequenceYieldAll */ - @kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public abstract suspend fun yieldAll(iterator: Iterator) /** @@ -73,7 +71,6 @@ public abstract class SequenceBuilder internal constructor() { * * @sample samples.collections.Sequences.Building.buildSequenceYieldAll */ - @kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public suspend fun yieldAll(elements: Iterable) { if (elements is Collection && elements.isEmpty()) return return yieldAll(elements.iterator()) @@ -86,7 +83,6 @@ public abstract class SequenceBuilder internal constructor() { * * @sample samples.collections.Sequences.Building.buildSequenceYieldAll */ - @kotlin.internal.RequireKotlin("1.3") // TODO: This is needed for tests only and can be safely removed after 1.3 is released public suspend fun yieldAll(sequence: Sequence) = yieldAll(sequence.iterator()) }