Use new inference

Author: dzharkov

kotlinx-coroutines-async/src/test/kotlin/AsyncIOTest.kt

@@ -1,7 +1,6 @@
 package kotlinx.coroutines.asyncIO
 
 import kotlinx.coroutines.*
-import kotlinx.coroutines.async
 import org.apache.commons.io.FileUtils
 import org.junit.Rule
 import org.junit.Test
@@ -36,7 +35,7 @@ class AsyncIOTest {
                         outputFile.toPath(),
                         StandardOpenOption.CREATE, StandardOpenOption.WRITE)
         val buf = ByteBuffer.allocate(1024)
-        val future = async<Unit> {
+        val future = async {
             var totalBytesRead = 0L
             var totalBytesWritten = 0L
             while (totalBytesRead < input.size()) {
@@ -69,7 +68,7 @@ class AsyncIOTest {
                         .bind(InetSocketAddress(8080))
 
         threadPool.submit {
-            async<Unit> {
+            async {
                 val client = serverChannel.aAccept()
                 val buffer = ByteBuffer.allocate(2)
                 client.aRead(buffer)
@@ -81,7 +80,7 @@ class AsyncIOTest {
             }
         }
 
-        async<Unit> {
+        async {
             val connection =
                     AsynchronousSocketChannel.open()
             // async calls

kotlinx-coroutines-async/src/test/kotlin/AsyncTest.kt

@@ -12,7 +12,7 @@ import kotlin.test.fail
 class AsyncTest {
     @Test
     fun testSimple() {
-        val future = async<String> {
+        val future = async {
             CompletableFuture.supplyAsync {
                 "O"
             }.await() + "K"
@@ -24,7 +24,7 @@ class AsyncTest {
     @Test
     fun testWaitForCompletion() {
         val toAwait = CompletableFuture<String>()
-        val future = async<String> {
+        val future = async {
             toAwait.await() + "K"
         }
 
@@ -53,7 +53,7 @@ class AsyncTest {
 
     @Test
     fun testExceptionInsideCoroutine() {
-        val future = async<String> {
+        val future = async {
             if (CompletableFuture.supplyAsync { true }.await()) {
                 throw IllegalStateException("OK")
             }
@@ -73,7 +73,7 @@ class AsyncTest {
     fun testContinuationWrapped() {
         val depth = AtomicInteger()
 
-        val future = async<String>(continuationWrapper = {
+        val future = async(continuationWrapper = {
             depth.andIncrement
             it()
             depth.andDecrement

kotlinx-coroutines-generate/src/test/kotlin/GenerateTest.kt

@@ -10,7 +10,7 @@ import kotlin.test.assertTrue
 class GenerateTest {
     @Test
     fun testSimple() {
-        val result = generate<Int> {
+        val result = generate {
             for (i in 1..3) {
                 yield(2 * i)
             }
@@ -23,7 +23,7 @@ class GenerateTest {
 
     @Test
     fun testCallHasNextSeveralTimes() {
-        val result = generate<Int> {
+        val result = generate {
             yield(1)
         }
 
@@ -44,7 +44,7 @@ class GenerateTest {
 
     @Test
     fun testManualIteration() {
-        val result = generate<Int> {
+        val result = generate {
             yield(1)
             yield(2)
             yield(3)
@@ -84,7 +84,7 @@ class GenerateTest {
     @Test
     fun testLaziness() {
         var sharedVar = -2
-        val result = generate<Int> {
+        val result = generate {
             while (true) {
                 when (sharedVar) {
                     -1 -> return@generate
@@ -116,7 +116,7 @@ class GenerateTest {
     @Test
     fun testExceptionInCoroutine() {
         var sharedVar = -2
-        val result = generate<Int> {
+        val result = generate {
             while (true) {
                 when (sharedVar) {
                     -1 -> return@generate
@@ -138,7 +138,7 @@ class GenerateTest {
     @Test
     fun testParallelIteration() {
         var inc = 0
-        val result = generate<Int> {
+        val result = generate {
             for (i in 1..3) {
                 inc++
                 yield(inc * i)

kotlinx-coroutines-rx-example/src/main/kotlin/main.kt

@@ -32,7 +32,7 @@ fun main(args: Array<String>) {
 
     val github = retrofit.create(GitHub::class.java)
 
-    asyncRx<Unit> {
+    asyncRx {
         val contributors =
                 github.contributors("JetBrains", "Kotlin")
                       .awaitSingle().take(10)

kotlinx-coroutines-rx/src/test/kotlin/AsyncRxTest.kt

@@ -9,7 +9,7 @@ import kotlin.test.fail
 class AsyncRxTest {
     @Test
     fun testSingle() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             Observable.just("O").awaitSingle() + "K"
         }
 
@@ -20,7 +20,7 @@ class AsyncRxTest {
 
     @Test
     fun testSingleWithDelay() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             Observable.timer(50, TimeUnit.MILLISECONDS).map { "O" }.awaitSingle() + "K"
         }
 
@@ -32,7 +32,7 @@ class AsyncRxTest {
 
     @Test
     fun testSingleException() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             Observable.just("O", "K").awaitSingle() + "K"
         }
 
@@ -43,7 +43,7 @@ class AsyncRxTest {
 
     @Test
     fun testAwaitFirst() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             Observable.just("O", "#").awaitFirst() + "K"
         }
 
@@ -54,7 +54,7 @@ class AsyncRxTest {
 
     @Test
     fun testAwaitLast() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             Observable.just("#", "O").awaitLast() + "K"
         }
 
@@ -65,7 +65,7 @@ class AsyncRxTest {
 
     @Test
     fun testExceptionFromObservable() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             try {
                 Observable.error<String>(RuntimeException("O")).awaitFirst()
             } catch (e: RuntimeException) {
@@ -80,7 +80,7 @@ class AsyncRxTest {
 
     @Test
     fun testExceptionFromCoroutine() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             error(Observable.just("O").awaitSingle() + "K")
         }
 
@@ -92,7 +92,7 @@ class AsyncRxTest {
 
     @Test
     fun testApplyForEachAndWait() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             var result = ""
 
             Observable.just("O", "K").applyForEachAndAwait {
@@ -109,7 +109,7 @@ class AsyncRxTest {
 
     @Test
     fun testApplyForEachAndWaitException() {
-        val observable = asyncRx<String> {
+        val observable = asyncRx {
             try {
                 Observable.error<String>(RuntimeException("OK")).applyForEachAndAwait {
                     fail("Should not be here")