aboutsummaryrefslogtreecommitdiffstats
path: root/kotlinx-coroutines-core/js/src/Exceptions.kt
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2021-08-17 16:49:58 -0700
committerAurimas Liutikas <aurimas@google.com>2021-08-18 08:57:44 -0700
commit531d55eaeac09ad6cde55687ef802d4235040985 (patch)
tree747e5be83c6e6a2e2d9a164ebd03c5e45e6ec952 /kotlinx-coroutines-core/js/src/Exceptions.kt
parentb5da2582b1f1d46a92cc6ceeb1525788addd5944 (diff)
parentb231887c3214187cf7f09a74073f84383a487b71 (diff)
downloadplatform_external_kotlinx.coroutines-531d55eaeac09ad6cde55687ef802d4235040985.tar.gz
platform_external_kotlinx.coroutines-531d55eaeac09ad6cde55687ef802d4235040985.tar.bz2
platform_external_kotlinx.coroutines-531d55eaeac09ad6cde55687ef802d4235040985.zip
Merge Kotlin coroutines 1.5.1HEADandroid-s-beta-5masterandroid-s-beta-5
https://github.com/Kotlin/kotlinx.coroutines/releases/tag/1.5.1 Test: mmma external/kotlinx.coroutines Change-Id: I7de89ccc26113be895f28935addb27ee07e50ee7
Diffstat (limited to 'kotlinx-coroutines-core/js/src/Exceptions.kt')
-rw-r--r--kotlinx-coroutines-core/js/src/Exceptions.kt7
1 files changed, 1 insertions, 6 deletions
diff --git a/kotlinx-coroutines-core/js/src/Exceptions.kt b/kotlinx-coroutines-core/js/src/Exceptions.kt
index 7c76bc6d..da9979b6 100644
--- a/kotlinx-coroutines-core/js/src/Exceptions.kt
+++ b/kotlinx-coroutines-core/js/src/Exceptions.kt
@@ -10,12 +10,7 @@ package kotlinx.coroutines
* **It is not printed to console/log by default uncaught exception handler**.
* (see [CoroutineExceptionHandler]).
*/
-public actual open class CancellationException(
- message: String?,
- cause: Throwable?
-) : IllegalStateException(message, cause) {
- public actual constructor(message: String?) : this(message, null)
-}
+public actual typealias CancellationException = kotlin.coroutines.cancellation.CancellationException
/**
* Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled or completed