Cleaned up deprecations and unused parameters

Author: elizarov

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt

@@ -133,7 +133,7 @@ public inline suspend fun <T> suspendCancellableCoroutine(
  * Removes a given node on cancellation.
  * @suppress **This is unstable API and it is subject to change.**
  */
-public fun CancellableContinuation<*>.removeOnCancel(node: LockFreeLinkedListNode): Job.Registration =
+public fun CancellableContinuation<*>.removeOnCancel(node: LockFreeLinkedListNode): DisposableHandle =
     invokeOnCompletion(RemoveOnCancel(this, node))
 
 // --------------- implementation details ---------------

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt

@@ -175,6 +175,7 @@ public interface Job : CoroutineContext.Element {
 /**
  * A handle to an allocated object that can be disposed to make it eligible for garbage collection.
  */
+@Suppress("DEPRECATION") // todo: remove when Job.Registration is removed
 public interface DisposableHandle : Job.Registration {
     /**
      * Disposes the corresponding object, making it eligible for garbage collection.

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/CoroutinesTest.kt

@@ -115,9 +115,9 @@ class CoroutinesTest : TestBase() {
     @Test
     fun testCancelNestedImplicit() = runBlocking {
         expect(1)
-        val j1 = launch(context) {
+        launch(context) {
             expect(3)
-            val j2 = launch(context) {
+            launch(context) {
                 expect(6)
                 yield() // parent finishes earlier, does not wait for us
                 expectUnreached()

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/JobTest.kt

@@ -69,10 +69,10 @@ class JobTest : TestBase() {
         val n = 100 * stressTestMultiplier
         val fireCount = IntArray(n)
         for (i in 0 until n) {
-            var registration: Job.Registration? = null
+            var registration: DisposableHandle? = null
             registration = job.invokeOnCompletion {
                 fireCount[i]++
-                registration!!.unregister()
+                registration!!.dispose()
             }
         }
         check(job.isActive)
@@ -92,10 +92,10 @@ class JobTest : TestBase() {
         val job = Job()
         val n = 100 * stressTestMultiplier
         val fireCount = IntArray(n)
-        val registrations = Array<Job.Registration>(n) { i -> job.invokeOnCompletion { fireCount[i]++ } }
+        val registrations = Array<DisposableHandle>(n) { i -> job.invokeOnCompletion { fireCount[i]++ } }
         check(job.isActive)
         fun unreg(i: Int) = i % 4 <= 1
-        for (i in 0 until n) if (unreg(i)) registrations[i].unregister()
+        for (i in 0 until n) if (unreg(i)) registrations[i].dispose()
         for (i in 0 until n) assertEquals(0, fireCount[i])
         job.cancel()
         check(!job.isActive)
@@ -125,7 +125,7 @@ class JobTest : TestBase() {
         val job = Job()
         val n = 10_000_000 * stressTestMultiplier
         var fireCount = 0
-        for (i in 0 until n) job.invokeOnCompletion { fireCount++ }.unregister()
+        for (i in 0 until n) job.invokeOnCompletion { fireCount++ }.dispose()
     }
 
     @Test

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedListTest.kt

@@ -97,9 +97,13 @@ class LockFreeLinkedListTest {
         single(n3.describeRemove()!!)
         assertContents(list, 1, 2, 4)
         assertTrue(n3.describeRemove() == null)
-        single(list.describeRemoveFirst()!!)
+        single(list.describeRemoveFirst())
         assertContents(list, 2, 4)
         assertTrue(n1.describeRemove() == null)
+        assertTrue(n2.remove())
+        assertContents(list, 4)
+        assertTrue(n4.remove())
+        assertContents(list)
     }
 
     private fun single(part: AtomicDesc) {

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectArrayChannelTest.kt

@@ -147,7 +147,7 @@ class SelectArrayChannelTest : TestBase() {
         expect(1)
         val channel = ArrayChannel<String>(1)
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
             default {
@@ -198,7 +198,7 @@ class SelectArrayChannelTest : TestBase() {
         channel.close()
         finish(2)
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
         }
@@ -216,7 +216,7 @@ class SelectArrayChannelTest : TestBase() {
         }
         expect(2)
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
         }
@@ -245,7 +245,7 @@ class SelectArrayChannelTest : TestBase() {
         expect(1)
         repeat(n) { i ->
             select {
-                channel.onReceive { v -> expectUnreached() }
+                channel.onReceive { expectUnreached() }
                 default { expect(i + 2) }
             }
         }

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectDeferredTest.kt

@@ -112,7 +112,7 @@ class SelectDeferredTest : TestBase() {
         }
         expect(2)
         val res = select<String> {
-            d1.onAwait { v1 ->
+            d1.onAwait {
                 expectUnreached()
                 "FAIL"
             }

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectMutexTest.kt

@@ -16,13 +16,13 @@
 
 package kotlinx.coroutines.experimental.selects
 
-import junit.framework.Assert.assertEquals
 import kotlinx.coroutines.experimental.TestBase
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.runBlocking
 import kotlinx.coroutines.experimental.sync.Mutex
 import kotlinx.coroutines.experimental.sync.MutexImpl
 import kotlinx.coroutines.experimental.yield
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 

kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectRendezvousChannelTest.kt

@@ -160,7 +160,7 @@ class SelectRendezvousChannelTest : TestBase() {
         expect(1)
         val channel = RendezvousChannel<String>()
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
             default {
@@ -207,7 +207,7 @@ class SelectRendezvousChannelTest : TestBase() {
         channel.close()
         finish(2)
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
         }
@@ -225,7 +225,7 @@ class SelectRendezvousChannelTest : TestBase() {
         }
         expect(2)
         select<Unit> {
-            channel.onReceive { v ->
+            channel.onReceive {
                 expectUnreached()
             }
         }
@@ -253,7 +253,7 @@ class SelectRendezvousChannelTest : TestBase() {
         expect(1)
         repeat(n) { i ->
             select {
-                channel.onReceive { v -> expectUnreached() }
+                channel.onReceive { expectUnreached() }
                 default { expect(i + 2) }
             }
         }

reactive/kotlinx-coroutines-rx1/src/test/kotlin/kotlinx/coroutines/experimental/rx1/ConvertTest.kt

@@ -117,8 +117,7 @@ class ConvertTest : TestBase() {
         val single = rxSingle(Unconfined) {
             var result = ""
             try {
-                for (x in observable)
-                    result += x
+                observable.consumeEach { result += it }
             } catch(e: Throwable) {
                 check(e is TestException)
                 result += e.message