Merge branch 'master' into develop

Author: qwwdfsad

CHANGES.md

@@ -1,9 +1,10 @@
 # Change log for kotlinx.coroutines
 
 ## Version 1.3.0-M2
+
  * Kotlin updated to 1.3.40.
  * `Flow` exception transparency concept.
- * New Flow declarative `Flow` operators: `onCompletion`, `catch`, `retryWhen`, `launchIn` (#1263).
+ * New declarative `Flow` operators: `onCompletion`, `catch`, `retryWhen`, `launchIn`. `onError*` operators are deprecated in favour of `catch`. (#1263)
  * `Publisher.asFlow` is integrated with `buffer` operator.
  * `Publisher.openSubscription` default request size is `1` instead of `0` (#1267).
 

docs/basics.md

@@ -326,7 +326,7 @@ World!
 
 
 But what if the extracted function contains a coroutine builder which is invoked on the current scope?
-In this case `suspend` modifier on the extracted function is not enough. Making `doWorld` extension
+In this case `suspend` modifier on the extracted function is not enough. Making `doWorld` an extension
 method on `CoroutineScope` is one of the solutions, but it may not always be applicable as it does not make API clearer.
 The idiomatic solution is to have either an explicit `CoroutineScope` as a field in a class containing the target function
 or an implicit one when the outer class implements `CoroutineScope`.

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

@@ -282,7 +282,7 @@ public fun <T> channelFlow(@BuilderInference block: suspend ProducerScope<T>.()
  *     }
  *     api.register(callback)
  *     // Suspend until either onCompleted or external cancellation are invoked
- *     await { api.unregister(callback) }
+ *     awaitClose { api.unregister(callback) }
  * }
  * ```
  */

kotlinx-coroutines-core/common/src/flow/internal/SafeCollector.kt

@@ -78,7 +78,7 @@ internal class SafeCollector<T>(
             if (emissionParentJob !== collectJob) {
                 error(
                     "Flow invariant is violated: emission from another coroutine is detected (child of $emissionParentJob, expected child of $collectJob). " +
-                            "FlowCollector is not thread-safe and concurrent emissions are prohibited. To mitigate this restriction please use 'flowChannel' builder instead of 'flow'"
+                            "FlowCollector is not thread-safe and concurrent emissions are prohibited. To mitigate this restriction please use 'channelFlow' builder instead of 'flow'"
                 )
             }
             count + 1