From fbf7142eaffee7350a53ee0ad80239a8f2839a2b Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 17 Jun 2021 17:15:45 +0800 Subject: [PATCH] Improve performance of `StateObserver.chainOfNotNull` --- .../kotlin/network/handler/state/StateObserver.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt b/mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt index 761e1aa78..2b3789f6c 100644 --- a/mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt +++ b/mirai-core/src/commonMain/kotlin/network/handler/state/StateObserver.kt @@ -12,7 +12,6 @@ package net.mamoe.mirai.internal.network.handler.state import net.mamoe.mirai.internal.network.component.ComponentKey import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.handler.NetworkHandlerSupport -import net.mamoe.mirai.internal.network.handler.state.CombinedStateObserver.Companion.plus import net.mamoe.mirai.utils.MiraiLogger import net.mamoe.mirai.utils.systemProp @@ -76,11 +75,7 @@ internal interface StateObserver { fun chainOfNotNull( vararg observers: StateObserver?, - ): StateObserver { - return observers.reduceOrNull { acc, stateObserver -> - acc + stateObserver - } ?: NOP - } + ): StateObserver = CombinedStateObserver(observers.filterNotNull()) val LOGGING: StateObserver? = when (systemProp( "mirai.debug.network.state.observer.logging",