Skip to content

Commit 549ed30

Browse files
committed
Make BindingException public
Fixes the following warning from IntelliJ: 'internal' type 'BindCancellationException' is accessed from 'public' inline declaration. This will become an error in language version 2.4. See https://youtrack.jetbrains.com/issue/KTLC-283.
1 parent d5c3996 commit 549ed30

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

kotlin-result-coroutines/src/commonMain/kotlin/com/github/michaelbull/result/coroutines/CoroutineBinding.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public suspend inline fun <V, E> coroutineBinding(crossinline block: suspend Cor
5555
Ok(block())
5656
}
5757
}
58-
} catch (ex: BindCancellationException) {
58+
} catch (ex: BindingCancellationException) {
5959
receiver.result ?: throw ex
6060
}
6161
}
6262

63-
internal object BindCancellationException : CancellationException(null as String?)
63+
public object BindingCancellationException : CancellationException(null as String?)
6464

6565
public interface CoroutineBindingScope<E> : CoroutineScope {
6666
public suspend fun <V> Result<V, E>.bind(): V
@@ -82,10 +82,10 @@ internal class CoroutineBindingScopeImpl<E>(
8282
mutex.withLock {
8383
if (result == null) {
8484
result = this.asErr()
85-
coroutineContext.cancel(BindCancellationException)
85+
coroutineContext.cancel(BindingCancellationException)
8686
}
8787

88-
throw BindCancellationException
88+
throw BindingCancellationException
8989
}
9090
}
9191
}

kotlin-result/src/commonMain/kotlin/com/github/michaelbull/result/Binding.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public inline fun <V, E> binding(crossinline block: BindingScope<E>.() -> V): Re
3333
return with(BindingScopeImpl<E>()) {
3434
try {
3535
Ok(block())
36-
} catch (_: BindException) {
36+
} catch (_: BindingException) {
3737
result!!
3838
}
3939
}
4040
}
4141

42-
internal expect object BindException : Exception
42+
public expect object BindingException : Exception
4343

4444
public interface BindingScope<E> {
4545
public fun <V> Result<V, E>.bind(): V
@@ -55,7 +55,7 @@ internal class BindingScopeImpl<E> : BindingScope<E> {
5555
value
5656
} else {
5757
result = this.asErr()
58-
throw BindException
58+
throw BindingException
5959
}
6060
}
6161
}

kotlin-result/src/jsMain/kotlin/com/github/michaelbull/result/BindException.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.github.michaelbull.result
2+
3+
public actual object BindingException : Exception()

kotlin-result/src/jvmMain/kotlin/com/github/michaelbull/result/BindException.kt renamed to kotlin-result/src/jvmMain/kotlin/com/github/michaelbull/result/BindingException.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.michaelbull.result
22

3-
internal actual object BindException : Exception() {
3+
public actual object BindingException : Exception() {
44
override fun fillInStackTrace(): Throwable {
55
return this
66
}

kotlin-result/src/nativeMain/kotlin/com/github/michaelbull/result/BindException.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.github.michaelbull.result
2+
3+
public actual object BindingException : Exception()

kotlin-result/src/wasmJsMain/kotlin/com/github/michaelbull/result/BindException.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.github.michaelbull.result
2+
3+
public actual object BindingException : Exception()

0 commit comments

Comments
 (0)