Update to 1.3-RC:

* Replace SuccessOrFailure with Result
* Replace buildSequence and buildIterator with sequence and iterator
* Apply @BuilderInference on all builders (including extension methods to workaround inference bug)

Author: qwwdfsad

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt

@@ -154,8 +154,10 @@ public abstract class kotlinx/coroutines/CoroutineDispatcher : kotlin/coroutines
 	public fun <init> ()V
 	public abstract fun dispatch (Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
 	public fun dispatchYield (Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+	public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
 	public fun interceptContinuation (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 	public fun isDispatchNeeded (Lkotlin/coroutines/CoroutineContext;)Z
+	public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
 	public final fun plus (Lkotlinx/coroutines/CoroutineDispatcher;)Lkotlinx/coroutines/CoroutineDispatcher;
 	public fun releaseInterceptedContinuation (Lkotlin/coroutines/Continuation;)V
 	public fun toString ()Ljava/lang/String;

build.gradle

@@ -54,6 +54,7 @@ allprojects {
 
     repositories {
         jcenter()
+        maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
         maven { url "https://kotlin.bintray.com/kotlin-dev" }
         maven { url "https://kotlin.bintray.com/kotlinx" }
     }

common/kotlinx-coroutines-core-common/src/AbstractContinuation.kt

@@ -139,7 +139,7 @@ internal abstract class AbstractContinuation<in T>(
         return getSuccessfulResult(state)
     }
 
-    override fun resumeWith(result: SuccessOrFailure<T>) =
+    override fun resumeWith(result: Result<T>) =
         resumeImpl(result.toState(), resumeMode)
 
     public fun invokeOnCancellation(handler: CompletionHandler) {

common/kotlinx-coroutines-core-common/src/AbstractCoroutine.kt

@@ -101,7 +101,7 @@ public abstract class AbstractCoroutine<in T>(
     /**
      * Completes execution of this with coroutine with the specified result.
      */
-    public final override fun resumeWith(result: SuccessOrFailure<T>) {
+    public final override fun resumeWith(result: Result<T>) {
         makeCompletingOnce(result.toState(), defaultResumeMode)
     }
 

common/kotlinx-coroutines-core-common/src/Builders.common.kt

@@ -4,13 +4,15 @@
 
 @file:JvmMultifileClass
 @file:JvmName("BuildersKt")
+@file:UseExperimental(ExperimentalTypeInference::class)
 
 package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 import kotlinx.coroutines.intrinsics.*
 import kotlin.coroutines.*
 import kotlin.coroutines.intrinsics.*
+import kotlin.experimental.*
 
 // --------------- basic coroutine builders ---------------
 
@@ -40,6 +42,7 @@ import kotlin.coroutines.intrinsics.*
  * @param onCompletion optional completion handler for the coroutine (see [Job.invokeOnCompletion]).
  * @param block the coroutine code which will be invoked in the context of the provided scope.
  **/
+@BuilderInference
 public fun CoroutineScope.launch(
     context: CoroutineContext = EmptyCoroutineContext,
     start: CoroutineStart = CoroutineStart.DEFAULT,
@@ -236,7 +239,7 @@ private class RunContinuationUnintercepted<in T>(
     override val context: CoroutineContext,
     private val continuation: Continuation<T>
 ): Continuation<T> {
-    override fun resumeWith(result: SuccessOrFailure<T>) {
+    override fun resumeWith(result: Result<T>) {
         withCoroutineContext(continuation.context) {
             continuation.resumeWith(result)
         }

common/kotlinx-coroutines-core-common/src/CompletedExceptionally.kt

@@ -10,7 +10,7 @@ import kotlin.coroutines.*
 /**
  * @suppress **This is unstable API and it is subject to change.**
  */
-public fun <T> SuccessOrFailure<T>.toState(): Any? =
+public fun <T> Result<T>.toState(): Any? =
     if (isSuccess) getOrThrow() else CompletedExceptionally(exceptionOrNull()!!) // todo: need to do it better
 
 /**

common/kotlinx-coroutines-core-common/src/CoroutineContext.common.kt

@@ -2,10 +2,14 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines
 
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
+@BuilderInference
 public expect fun CoroutineScope.newCoroutineContext(context: CoroutineContext): CoroutineContext
 
 @Suppress("PropertyName")

common/kotlinx-coroutines-core-common/src/CoroutineScope.kt

@@ -2,10 +2,13 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Defines a scope for new coroutines. Every coroutine builder
@@ -82,6 +85,7 @@ public interface CoroutineScope {
  *
  * This is a shorthand for `CoroutineScope(thisScope + context)`.
  */
+@BuilderInference
 public operator fun CoroutineScope.plus(context: CoroutineContext): CoroutineScope =
     CoroutineScope(coroutineContext + context)
 
@@ -101,6 +105,7 @@ public operator fun CoroutineScope.plus(context: CoroutineContext): CoroutineSco
  * [isActive][kotlinx.coroutines.isActive] and [Job.isActive].
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+@BuilderInference
 public val CoroutineScope.isActive: Boolean
     get() = coroutineContext[Job]?.isActive ?: true
 

common/kotlinx-coroutines-core-common/src/Deferred.kt

@@ -2,11 +2,14 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines
 
 import kotlinx.coroutines.intrinsics.*
 import kotlinx.coroutines.selects.*
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Deferred value is a non-blocking cancellable future.
@@ -142,6 +145,7 @@ public interface Deferred<out T> : Job {
  * @param onCompletion optional completion handler for the coroutine (see [Job.invokeOnCompletion]).
  * @param block the coroutine code.
  */
+@BuilderInference
 public fun <T> CoroutineScope.async(
     context: CoroutineContext = EmptyCoroutineContext,
     start: CoroutineStart = CoroutineStart.DEFAULT,

common/kotlinx-coroutines-core-common/src/Dispatched.kt

@@ -27,7 +27,7 @@ internal class DispatchedContinuation<in T>(
     override val delegate: Continuation<T>
         get() = this
 
-    override fun resumeWith(result: SuccessOrFailure<T>) {
+    override fun resumeWith(result: Result<T>) {
         val context = continuation.context
         if (dispatcher.isDispatchNeeded(context)) {
             _state = result.toState()
@@ -60,7 +60,7 @@ internal class DispatchedContinuation<in T>(
     }
 
     @Suppress("NOTHING_TO_INLINE") // we need it inline to save us an entry on the stack
-    inline fun resumeUndispatchedWith(result: SuccessOrFailure<T>) {
+    inline fun resumeUndispatchedWith(result: Result<T>) {
         withCoroutineContext(context) {
             continuation.resumeWith(result)
         }

common/kotlinx-coroutines-core-common/src/JobSupport.kt

@@ -761,7 +761,7 @@ internal open class JobSupport constructor(active: Boolean) : Job, SelectClause0
         }
     }
 
-    public final override val children: Sequence<Job> get() = buildSequence {
+    public final override val children: Sequence<Job> get() = sequence {
         val state = this@JobSupport.state
         when (state) {
             is ChildJob -> yield(state.childJob)

common/kotlinx-coroutines-core-common/src/channels/Broadcast.kt

@@ -2,13 +2,16 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines.channels
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel.Factory.CONFLATED
 import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import kotlinx.coroutines.intrinsics.*
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Broadcasts all elements of the channel.
@@ -43,7 +46,7 @@ public fun <E> broadcast(
     start: CoroutineStart = CoroutineStart.LAZY,
     parent: Job? = null,
     onCompletion: CompletionHandler? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): BroadcastChannel<E> =
     GlobalScope.broadcast(context + (parent ?: EmptyCoroutineContext), capacity, start, onCompletion, block)
 
@@ -83,12 +86,13 @@ public fun <E> broadcast(
  * @param onCompletion optional completion handler for the producer coroutine (see [Job.invokeOnCompletion]).
  * @param block the coroutine code.
  */
+@BuilderInference
 public fun <E> CoroutineScope.broadcast(
     context: CoroutineContext = EmptyCoroutineContext,
     capacity: Int = 1,
     start: CoroutineStart = CoroutineStart.LAZY,
     onCompletion: CompletionHandler? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): BroadcastChannel<E> {
     val newContext = newCoroutineContext(context)
     val channel = BroadcastChannel<E>(capacity)

common/kotlinx-coroutines-core-common/src/channels/Produce.kt

@@ -2,11 +2,14 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines.channels
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Scope for [produce][CoroutineScope.produce] coroutine builder.
@@ -65,11 +68,12 @@ interface ProducerJob<out E> : ReceiveChannel<E>, Job {
  * @param onCompletion optional completion handler for the producer coroutine (see [Job.invokeOnCompletion]).
  * @param block the coroutine code.
  */
+@BuilderInference
 public fun <E> CoroutineScope.produce(
     context: CoroutineContext = EmptyCoroutineContext,
     capacity: Int = 0,
     onCompletion: CompletionHandler? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E> {
     val channel = Channel<E>(capacity)
     val newContext = newCoroutineContext(context)
@@ -93,7 +97,7 @@ public fun <E> produce(
     context: CoroutineContext = Dispatchers.Default,
     capacity: Int = 0,
     onCompletion: CompletionHandler? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E> =
     GlobalScope.produce(context, capacity, onCompletion, block)
 
@@ -112,7 +116,7 @@ public fun <E> produce(
     capacity: Int = 0,
     parent: Job? = null,
     onCompletion: CompletionHandler? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E> =
     GlobalScope.produce(context + (parent ?: EmptyCoroutineContext), capacity, onCompletion, block)
 
@@ -122,15 +126,15 @@ public fun <E> produce(
     context: CoroutineContext = Dispatchers.Default,
     capacity: Int = 0,
     parent: Job? = null,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ReceiveChannel<E> = GlobalScope.produce(context + (parent ?: EmptyCoroutineContext), capacity, block = block)
 
 /** @suppress **Deprecated**: Binary compatibility */
 @Deprecated(message = "Binary compatibility", level = DeprecationLevel.HIDDEN)
 public fun <E> produce(
     context: CoroutineContext = Dispatchers.Default,
     capacity: Int = 0,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ProducerJob<E> =
     GlobalScope.produce(context, capacity, block = block) as ProducerJob<E>
 
@@ -141,7 +145,7 @@ public fun <E> produce(
 public fun <E> buildChannel(
     context: CoroutineContext,
     capacity: Int = 0,
-    block: suspend ProducerScope<E>.() -> Unit
+    @BuilderInference block: suspend ProducerScope<E>.() -> Unit
 ): ProducerJob<E> =
     GlobalScope.produce(context, capacity, block = block) as ProducerJob<E>
 

common/kotlinx-coroutines-core-common/src/selects/Select.kt

@@ -235,7 +235,7 @@ internal class SelectBuilderImpl<in R>(
     }
 
     // Resumes in MODE_DIRECT
-    override fun resumeWith(result: SuccessOrFailure<R>) {
+    override fun resumeWith(result: Result<R>) {
         doResume({ result.toState() }) {
             uCont.resumeWith(result)
         }

common/kotlinx-coroutines-core-common/test/selects/SelectBuilderImplTest.kt

@@ -14,7 +14,7 @@ class SelectBuilderImplTest {
         var resumed = false
         val delegate = object : Continuation<String> {
             override val context: CoroutineContext get() = EmptyCoroutineContext
-            override fun resumeWith(result: SuccessOrFailure<String>) {
+            override fun resumeWith(result: Result<String>) {
                 check(result.getOrNull() == "OK")
                 resumed = true
             }
@@ -39,7 +39,7 @@ class SelectBuilderImplTest {
         var resumed = false
         val delegate = object : Continuation<String> {
             override val context: CoroutineContext get() = EmptyCoroutineContext
-            override fun resumeWith(result: SuccessOrFailure<String>) {
+            override fun resumeWith(result: Result<String>) {
                 check(result.getOrNull() == "OK")
                 resumed = true
             }
@@ -64,7 +64,7 @@ class SelectBuilderImplTest {
         var resumed = false
         val delegate = object : Continuation<String> {
             override val context: CoroutineContext get() = EmptyCoroutineContext
-            override fun resumeWith(result: SuccessOrFailure<String>) {
+            override fun resumeWith(result: Result<String>) {
                 check(result.exceptionOrNull() is TestException)
                 resumed = true
             }
@@ -94,7 +94,7 @@ class SelectBuilderImplTest {
         var resumed = false
         val delegate = object : Continuation<String> {
             override val context: CoroutineContext get() = EmptyCoroutineContext
-            override fun resumeWith(result: SuccessOrFailure<String>) {
+            override fun resumeWith(result: Result<String>) {
                 check(result.exceptionOrNull() is TestException)
                 resumed = true
             }

core/kotlinx-coroutines-core/src/CoroutineContext.kt

@@ -2,12 +2,15 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 import kotlinx.coroutines.scheduling.*
 import java.util.concurrent.atomic.*
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Name of the property that controls coroutine debugging. See [newCoroutineContext][CoroutineScope.newCoroutineContext].
@@ -102,6 +105,7 @@ public val IO: CoroutineDispatcher
  * Coroutine name can be explicitly assigned using [CoroutineName] context element.
  * The string "coroutine" is used as a default name.
  */
+@BuilderInference
 public actual fun CoroutineScope.newCoroutineContext(context: CoroutineContext): CoroutineContext {
     val combined = coroutineContext + context
     val debug = if (DEBUG) combined + CoroutineId(COROUTINE_ID.incrementAndGet()) else combined

core/kotlinx-coroutines-core/src/channels/Actor.kt

@@ -2,13 +2,16 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+@file:UseExperimental(ExperimentalTypeInference::class)
+
 package kotlinx.coroutines.channels
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import kotlinx.coroutines.intrinsics.*
 import kotlinx.coroutines.selects.*
 import kotlin.coroutines.*
+import kotlin.experimental.*
 
 /**
  * Scope for [actor][GlobalScope.actor] coroutine builder.
@@ -111,6 +114,7 @@ interface ActorJob<in E> : SendChannel<E> {
  * @param onCompletion optional completion handler for the actor coroutine (see [Job.invokeOnCompletion]).
  * @param block the coroutine code.
  */
+@BuilderInference
 public fun <E> CoroutineScope.actor(
     context: CoroutineContext = EmptyCoroutineContext,
     capacity: Int = 0,

core/kotlinx-coroutines-core/test/DelayJvmTest.kt

@@ -65,7 +65,7 @@ class DelayJvmTest : TestBase() {
         override val context: CoroutineContext
             get() = cont.context
 
-        override fun resumeWith(result: SuccessOrFailure<T>) {
+        override fun resumeWith(result: Result<T>) {
             pool.execute { cont.resumeWith(result) }
         }
     }

core/kotlinx-coroutines-core/test/IODispatcherTest.kt

@@ -17,6 +17,7 @@ class IODispatcherTest : TestBase() {
             expect(2)
             assertNotSame(mainThread, Thread.currentThread())
         }
+
         expect(3)
         assertSame(mainThread, Thread.currentThread())
         finish(4)