diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/experimental/migration/CoroutinesMigration.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/experimental/migration/CoroutinesMigration.kt index b5cc9d409b5..9d2e388526c 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/experimental/migration/CoroutinesMigration.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/experimental/migration/CoroutinesMigration.kt @@ -10,7 +10,6 @@ import kotlin.coroutines.experimental.CoroutineContext as ExperimentalCoroutineC import kotlin.coroutines.experimental.AbstractCoroutineContextElement as ExperimentalAbstractCoroutineContextElement import kotlin.coroutines.experimental.EmptyCoroutineContext as ExperimentalEmptyCoroutineContext import kotlin.coroutines.experimental.ContinuationInterceptor as ExperimentalContinuationInterceptor -import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED as EXPERIMENTAL_COROUTINE_SUSPENDED import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* @@ -124,8 +123,7 @@ private class ExperimentalSuspendFunction0Migration( val function: (Continuation) -> Any? ) : (ExperimentalContinuation) -> Any? { override fun invoke(continuation: ExperimentalContinuation): Any? { - val result = function(continuation.toContinuation()) - return if (result === COROUTINE_SUSPENDED) EXPERIMENTAL_COROUTINE_SUSPENDED else result + return function(continuation.toContinuation()) } } @@ -133,8 +131,7 @@ private class ExperimentalSuspendFunction1Migration( val function: (T1, Continuation) -> Any? ) : (T1, ExperimentalContinuation) -> Any? { override fun invoke(t1: T1, continuation: ExperimentalContinuation): Any? { - val result = function(t1, continuation.toContinuation()) - return if (result === COROUTINE_SUSPENDED) EXPERIMENTAL_COROUTINE_SUSPENDED else result + return function(t1, continuation.toContinuation()) } } @@ -142,7 +139,6 @@ private class ExperimentalSuspendFunction2Migration( val function: (T1, T2, Continuation) -> Any? ) : (T1, T2, ExperimentalContinuation) -> Any? { override fun invoke(t1: T1, t2: T2, continuation: ExperimentalContinuation): Any? { - val result = function(t1, t2, continuation.toContinuation()) - return if (result === COROUTINE_SUSPENDED) EXPERIMENTAL_COROUTINE_SUSPENDED else result + return function(t1, t2, continuation.toContinuation()) } }