Do not mark AbstractFlow as brittle for inheritance

Kotlin · May 22, 2024 · f0f1c2a · f0f1c2a
1 parent 4aaf79d
commit f0f1c2a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/kotlinx-coroutines-core/common/src/flow/Builders.kt b/kotlinx-coroutines-core/common/src/flow/Builders.kt
@@ -52,7 +52,6 @@ import kotlinx.coroutines.flow.internal.unsafeFlow as flow
 public fun <T> flow(@BuilderInference block: suspend FlowCollector<T>.() -> Unit): Flow<T> = SafeFlow(block)
 
 // Named anonymous object
-@OptIn(BrittleForInheritanceCoroutinesApi::class)
 private class SafeFlow<T>(private val block: suspend FlowCollector<T>.() -> Unit) : AbstractFlow<T>() {
     override suspend fun collectSafely(collector: FlowCollector<T>) {
         collector.block()

diff --git a/kotlinx-coroutines-core/common/src/flow/Flow.kt b/kotlinx-coroutines-core/common/src/flow/Flow.kt
@@ -219,9 +219,8 @@ public interface Flow<out T> {
  * }
  * ```
  */
-@OptIn(ExperimentalSubclassOptIn::class)
 @ExperimentalCoroutinesApi
-@SubclassOptInRequired(BrittleForInheritanceCoroutinesApi::class)
+@OptIn(BrittleForInheritanceCoroutinesApi::class)
 public abstract class AbstractFlow<T> : Flow<T>, CancellableFlow<T> {
 
     public final override suspend fun collect(collector: FlowCollector<T>) {