github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-23 06:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix addSuppressed

Browse Source
This commit is contained in:
Him188 2020-03-06 22:04:55 +08:00
parent 92df108740
commit 37344c19d6
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
View File

@ -4,9 +4,8 @@ import android.os.Build
private var isAddSuppressedSupported: Boolean = true private var isAddSuppressedSupported: Boolean = true
@MiraiInternalAPI @PublishedApi
@Suppress("EXTENSION_SHADOWED_BY_MEMBER") internal actual fun Throwable.addSuppressedMirai(e: Throwable) {
actual fun Throwable.addSuppressed(e: Throwable) {
if (this === e) { if (this === e) {
return return
} }

11
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/tryNTimes.kt
View File

@ -9,9 +9,8 @@
package net.mamoe.mirai.utils package net.mamoe.mirai.utils
@MiraiInternalAPI @PublishedApi
@Suppress("EXTENSION_SHADOWED_BY_MEMBER") internal expect fun Throwable.addSuppressedMirai(e: Throwable)
expect fun Throwable.addSuppressed(e: Throwable)
@MiraiInternalAPI @MiraiInternalAPI
@Suppress("DuplicatedCode") @Suppress("DuplicatedCode")
@ -24,7 +23,7 @@ inline fun <R> tryNTimes(repeat: Int, block: (Int) -> R): R {
} catch (e: Throwable) { } catch (e: Throwable) {
if (lastException == null) { if (lastException == null) {
lastException = e lastException = e
} else lastException!!.addSuppressed(e) } else lastException!!.addSuppressedMirai(e)
} }
} }
@ -42,7 +41,7 @@ inline fun <R> tryNTimesOrNull(repeat: Int, block: (Int) -> R): R? {
} catch (e: Throwable) { } catch (e: Throwable) {
if (lastException == null) { if (lastException == null) {
lastException = e lastException = e
} else lastException!!.addSuppressed(e) } else lastException!!.addSuppressedMirai(e)
} }
} }
@ -61,7 +60,7 @@ inline fun <R> tryNTimesOrException(repeat: Int, block: (Int) -> R): Throwable?
} catch (e: Throwable) { } catch (e: Throwable) {
if (lastException == null) { if (lastException == null) {
lastException = e lastException = e
} else lastException!!.addSuppressed(e) } else lastException!!.addSuppressedMirai(e)
} }
} }

5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
View File

@ -2,9 +2,8 @@ package net.mamoe.mirai.utils
private var isAddSuppressedSupported: Boolean = true private var isAddSuppressedSupported: Boolean = true
@MiraiInternalAPI @PublishedApi
@Suppress("EXTENSION_SHADOWED_BY_MEMBER") internal actual fun Throwable.addSuppressedMirai(e: Throwable) {
actual fun Throwable.addSuppressed(e: Throwable) {
if (this === e) { if (this === e) {
return return
} }