aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Elizarov <elizarov@gmail.com>2019-08-26 19:16:23 +0300
committerRoman Elizarov <elizarov@gmail.com>2019-08-26 19:16:23 +0300
commite95d808cfd7953ccd7f14b70c654ae47c9afaf66 (patch)
tree3114b7f58e46f1180ead804b9d0e8ca100049fa5
parent6dc1bd5e825b76f419f247a3d233a145782af59c (diff)
downloadplatform_external_kotlinx.coroutines-e95d808cfd7953ccd7f14b70c654ae47c9afaf66.tar.gz
platform_external_kotlinx.coroutines-e95d808cfd7953ccd7f14b70c654ae47c9afaf66.tar.bz2
platform_external_kotlinx.coroutines-e95d808cfd7953ccd7f14b70c654ae47c9afaf66.zip
Reknit after update of shared-mutable-state-and-concurrency.md
-rw-r--r--coroutines-guide.md2
-rw-r--r--kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/coroutines-guide.md b/coroutines-guide.md
index 9267efd1..4a7fb67a 100644
--- a/coroutines-guide.md
+++ b/coroutines-guide.md
@@ -77,7 +77,7 @@ The main coroutines guide has moved to the [docs folder](docs/coroutines-guide.m
* <a name='imperative-finally-block'></a>[Imperative finally block](docs/flow.md#imperative-finally-block)
* <a name='declarative-handling'></a>[Declarative handling](docs/flow.md#declarative-handling)
* <a name='upstream-exceptions-only'></a>[Upstream exceptions only](docs/flow.md#upstream-exceptions-only)
- * <a name='imperative-versus-declarative'></a>[Imperative versus declarative](docs/flow.md#imperative-versus-declarative)
+ * <a name='imperative-versus-declarative'></a>[Imperative versus declarative](docs/flow.md#imperative-versus-declarative)
* <a name='launching-flow'></a>[Launching flow](docs/flow.md#launching-flow)
<!--- TOC_REF docs/channels.md -->
* <a name='channels'></a>[Channels](docs/channels.md#channels)
diff --git a/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt b/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
index 49f07017..65e20500 100644
--- a/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
+++ b/kotlinx-coroutines-core/jvm/test/guide/example-sync-07.kt
@@ -40,7 +40,7 @@ fun CoroutineScope.counterActor() = actor<CounterMsg> {
}
}
-fun main() = runBlocking {
+fun main() = runBlocking<Unit> {
val counter = counterActor() // create the actor
withContext(Dispatchers.Default) {
massiveRun {