Fix references to coroutineContext is the docs of all the builders

elizarov · elizarov · commit c7d10a4e9a8f · 2018-03-13T18:28:42.000+03:00
diff --git a/core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/Actor.kt b/core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/Actor.kt
@@ -56,7 +56,7 @@ interface ActorJob<in E> : SendChannel<E> {
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/Produce.kt b/core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/Produce.kt
@@ -56,7 +56,7 @@ interface ProducerJob<out E> : ReceiveChannel<E>, Job {
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/integration/kotlinx-coroutines-guava/src/main/kotlin/kotlinx/coroutines/experimental/guava/ListenableFuture.kt b/integration/kotlinx-coroutines-guava/src/main/kotlin/kotlinx/coroutines/experimental/guava/ListenableFuture.kt
@@ -28,7 +28,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-reactive/src/main/kotlin/kotlinx/coroutines/experimental/reactive/Publish.kt b/reactive/kotlinx-coroutines-reactive/src/main/kotlin/kotlinx/coroutines/experimental/reactive/Publish.kt
@@ -40,7 +40,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
 
diff --git a/reactive/kotlinx-coroutines-reactor/src/main/kotlin/kotlinx/coroutines/experimental/reactor/Mono.kt b/reactive/kotlinx-coroutines-reactor/src/main/kotlin/kotlinx/coroutines/experimental/reactor/Mono.kt
@@ -33,7 +33,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxCompletable.kt b/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxCompletable.kt
@@ -32,7 +32,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxObservable.kt b/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxObservable.kt
@@ -40,7 +40,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxSingle.kt b/reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxSingle.kt
@@ -32,7 +32,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  * 
diff --git a/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxCompletable.kt b/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxCompletable.kt
@@ -33,7 +33,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  * 
diff --git a/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxFlowable.kt b/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxFlowable.kt
@@ -23,8 +23,7 @@ import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.channels.ProducerScope
 import kotlinx.coroutines.experimental.reactive.publish
-import kotlin.coroutines.experimental.ContinuationInterceptor
-import kotlin.coroutines.experimental.CoroutineContext
+import kotlin.coroutines.experimental.*
 
 /**
  * Creates cold [flowable][Flowable] that will run a given [block] in a coroutine.
@@ -42,7 +41,7 @@ import kotlin.coroutines.experimental.CoroutineContext
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * If the context does not have any dispatcher nor any other [ContinuationInterceptor], then [DefaultDispatcher] is used.
  *
diff --git a/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxMaybe.kt b/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxMaybe.kt
@@ -34,7 +34,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxObservable.kt b/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxObservable.kt
@@ -41,7 +41,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *
diff --git a/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxSingle.kt b/reactive/kotlinx-coroutines-rx2/src/main/kotlin/kotlinx/coroutines/experimental/rx2/RxSingle.kt
@@ -33,7 +33,7 @@ import kotlin.coroutines.experimental.*
  *
  * The [context] for the new coroutine can be explicitly specified.
  * See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,
+ * The [coroutineContext] of the parent coroutine may be used,
  * in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.
  * The parent job may be also explicitly specified using [parent] parameter.
  *

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ interface ActorJob<in E> : SendChannel<E> {`
`56`	`56`	`*`
`57`	`57`	`* The [context] for the new coroutine can be explicitly specified.`
`58`	`58`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`59`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`59`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`60`	`60`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`61`	`61`	`* The parent job may be also explicitly specified using [parent] parameter.`
`62`	`62`	`*`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ interface ProducerJob<out E> : ReceiveChannel<E>, Job {`
`56`	`56`	`*`
`57`	`57`	`* The [context] for the new coroutine can be explicitly specified.`
`58`	`58`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`59`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`59`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`60`	`60`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`61`	`61`	`* The parent job may be also explicitly specified using [parent] parameter.`
`62`	`62`	`*`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import kotlin.coroutines.experimental.*`
`28`	`28`	`*`
`29`	`29`	`* The [context] for the new coroutine can be explicitly specified.`
`30`	`30`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`31`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`31`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`32`	`32`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`33`	`33`	`* The parent job may be also explicitly specified using [parent] parameter.`
`34`	`34`	`*`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ import kotlin.coroutines.experimental.*`
`40`	`40`	`*`
`41`	`41`	`* The [context] for the new coroutine can be explicitly specified.`
`42`	`42`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`43`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`43`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`44`	`44`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`45`	`45`	`* The parent job may be also explicitly specified using [parent] parameter.`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import kotlin.coroutines.experimental.*`
`33`	`33`	`*`
`34`	`34`	`* The [context] for the new coroutine can be explicitly specified.`
`35`	`35`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`36`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`36`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`37`	`37`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`38`	`38`	`* The parent job may be also explicitly specified using [parent] parameter.`
`39`	`39`	`*`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import kotlin.coroutines.experimental.*`
`32`	`32`	`*`
`33`	`33`	`* The [context] for the new coroutine can be explicitly specified.`
`34`	`34`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`35`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`35`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`36`	`36`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`37`	`37`	`* The parent job may be also explicitly specified using [parent] parameter.`
`38`	`38`	`*`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import kotlin.coroutines.experimental.*`
`34`	`34`	`*`
`35`	`35`	`* The [context] for the new coroutine can be explicitly specified.`
`36`	`36`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`37`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`37`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`38`	`38`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`39`	`39`	`* The parent job may be also explicitly specified using [parent] parameter.`
`40`	`40`	`*`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ import kotlin.coroutines.experimental.*`
`41`	`41`	`*`
`42`	`42`	`* The [context] for the new coroutine can be explicitly specified.`
`43`	`43`	* See [CoroutineDispatcher] for the standard context implementations that are provided by `kotlinx.coroutines`.
`44`		`- * The [context][CoroutineScope.context] of the parent coroutine from its [scope][CoroutineScope] may be used,`
	`44`	`+ * The [coroutineContext] of the parent coroutine may be used,`
`45`	`45`	`* in which case the [Job] of the resulting coroutine is a child of the job of the parent coroutine.`
`46`	`46`	`* The parent job may be also explicitly specified using [parent] parameter.`
`47`	`47`	`*`