Reuse RxJava built-in disposed Disposable (#1841)

qwwdfsad · web-flow · commit 8d8a8fb1b126 · 2020-03-04T23:33:18.000+03:00
diff --git a/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt b/reactive/kotlinx-coroutines-rx2/src/RxConvert.kt
@@ -100,12 +100,7 @@ public fun <T: Any> ObservableSource<T>.asFlow(): Flow<T> = callbackFlow {
     }
 
     subscribe(observer)
-    awaitClose { disposableRef.getAndSet(Disposed)?.dispose() }
-}
-
-private object Disposed : Disposable {
-    override fun isDisposed() = true
-    override fun dispose() = Unit
+    awaitClose { disposableRef.getAndSet(Disposables.disposed())?.dispose() }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,7 @@ public fun <T: Any> ObservableSource<T>.asFlow(): Flow<T> = callbackFlow {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`subscribe(observer)`
`103`		`- awaitClose { disposableRef.getAndSet(Disposed)?.dispose() }`
`104`		`-}`
`105`		`-`
`106`		`-private object Disposed : Disposable {`
`107`		`- override fun isDisposed() = true`
`108`		`- override fun dispose() = Unit`
	`103`	`+ awaitClose { disposableRef.getAndSet(Disposables.disposed())?.dispose() }`
`109`	`104`	`}`
`110`	`105`
`111`	`106`	`/**`