Skip to content

Commit 5ea1bed

Browse files
committed
Rename TimedRunnable to TimedRunnableObsolete in obsolete kotlinx.coroutines.test package to avoid FQN clash
Fixes #1159
1 parent e569bd3 commit 5ea1bed

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

kotlinx-coroutines-core/jvm/src/test_/TestCoroutineContext.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class TestCoroutineContext(private val name: String? = null) : CoroutineContext
4343
}
4444

4545
// The ordered queue for the runnable tasks.
46-
private val queue = ThreadSafeHeap<TimedRunnable>()
46+
private val queue = ThreadSafeHeap<TimedRunnableObsolete>()
4747

4848
// The per-scheduler global order counter.
4949
private var counter = 0L
@@ -184,10 +184,10 @@ class TestCoroutineContext(private val name: String? = null) : CoroutineContext
184184
}
185185

186186
private fun enqueue(block: Runnable) =
187-
queue.addLast(TimedRunnable(block, counter++))
187+
queue.addLast(TimedRunnableObsolete(block, counter++))
188188

189189
private fun postDelayed(block: Runnable, delayTime: Long) =
190-
TimedRunnable(block, counter++, time + TimeUnit.MILLISECONDS.toNanos(delayTime))
190+
TimedRunnableObsolete(block, counter++, time + TimeUnit.MILLISECONDS.toNanos(delayTime))
191191
.also {
192192
queue.addLast(it)
193193
}
@@ -245,17 +245,17 @@ class TestCoroutineContext(private val name: String? = null) : CoroutineContext
245245
}
246246
}
247247

248-
private class TimedRunnable(
248+
private class TimedRunnableObsolete(
249249
private val run: Runnable,
250250
private val count: Long = 0,
251251
@JvmField internal val time: Long = 0
252-
) : Comparable<TimedRunnable>, Runnable by run, ThreadSafeHeapNode {
252+
) : Comparable<TimedRunnableObsolete>, Runnable by run, ThreadSafeHeapNode {
253253
override var heap: ThreadSafeHeap<*>? = null
254254
override var index: Int = 0
255255

256256
override fun run() = run.run()
257257

258-
override fun compareTo(other: TimedRunnable) = if (time == other.time) {
258+
override fun compareTo(other: TimedRunnableObsolete) = if (time == other.time) {
259259
count.compareTo(other.count)
260260
} else {
261261
time.compareTo(other.time)

0 commit comments

Comments
 (0)