Update to 1.3-RC version, replace SuccessOrFailure with Result

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

@@ -236,7 +236,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/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/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/test/DelayJvmTest.kt

@@ -66,7 +66,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/linearizability/LinTesting.kt

@@ -45,7 +45,7 @@ class LinTesting {
                 override val context: CoroutineContext
                     get() = EmptyCoroutineContext
 
-                override fun resumeWith(result: SuccessOrFailure<Any?>) {
+                override fun resumeWith(result: kotlin.Result<Any?>) {
                     val value = if (result.isSuccess) result.getOrNull() else result.exceptionOrNull()
                     resumed.get() += OpResult(name, repr(value))
                 }

gradle.properties

@@ -1,7 +1,7 @@
 # Kotlin
-version=0.26.0-eap13-SNAPSHOT
+version=0.26.0-rc13-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.3-M2
+kotlin_version=1.3.0-rc-6
 kotlin_native_version=0.9
 
 # Dependencies

integration/kotlinx-coroutines-guava/src/ListenableFuture.kt

@@ -106,7 +106,7 @@ private class ListenableFutureCoroutine<T>(
 ) : AbstractFuture<T>(), Continuation<T>, CoroutineScope {
     override val coroutineContext: CoroutineContext get() = context
     override val isActive: Boolean get() = context[Job]!!.isActive
-    override fun resumeWith(result: SuccessOrFailure<T>) {
+    override fun resumeWith(result: Result<T>) {
         result
             .onSuccess { set(it) }
             .onFailure { setException(it) }

integration/kotlinx-coroutines-jdk8/src/future/Future.kt

@@ -107,7 +107,7 @@ private class CompletableFutureCoroutine<T>(
 ) : CompletableFuture<T>(), Continuation<T>, CoroutineScope {
     override val coroutineContext: CoroutineContext get() = context
     override val isActive: Boolean get() = context[Job]!!.isActive
-    override fun resumeWith(result: SuccessOrFailure<T>) {
+    override fun resumeWith(result: Result<T>) {
         result
             .onSuccess { complete(it) }
             .onFailure { completeExceptionally(it) }

integration/kotlinx-coroutines-quasar/src/Quasar.kt

@@ -47,7 +47,7 @@ private class CoroutineAsync<T>(
     override val context: CoroutineContext =
         GlobalScope.newCoroutineContext(Fiber.currentFiber().scheduler.executor.asCoroutineDispatcher())
 
-    override fun resumeWith(result: SuccessOrFailure<T>) {
+    override fun resumeWith(result: Result<T>) {
         result
             .onSuccess { asyncCompleted(it) }
             .onFailure { asyncFailed(it) }