From 138ab133641e0df0e9cfba6ebce559d341a1493c Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 26 Oct 2018 05:45:04 +0300
Subject: [PATCH] Remove experimental coroutines usages from stdlib generator

---
 libraries/tools/kotlin-stdlib-gen/build.gradle                | 2 +-
 .../kotlin-stdlib-gen/src/templates/dsl/TemplateGroups.kt     | 3 +--
 .../tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt    | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-stdlib-gen/build.gradle b/libraries/tools/kotlin-stdlib-gen/build.gradle
index e18761bffd8..f5045841fef 100644
--- a/libraries/tools/kotlin-stdlib-gen/build.gradle
+++ b/libraries/tools/kotlin-stdlib-gen/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
 compileKotlin {
     kotlinOptions {
-        freeCompilerArgs = ["-version", "-Xnormalize-constructor-calls=enable", "-XXLanguage:-ReleaseCoroutines"]
+        freeCompilerArgs = ["-version"]
     }
 }
 
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/TemplateGroups.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/TemplateGroups.kt
index f9ff22a386c..a983ca0a1b2 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/TemplateGroups.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/TemplateGroups.kt
@@ -5,7 +5,6 @@
 
 package templates
 
-import kotlin.coroutines.experimental.buildSequence
 import kotlin.reflect.KTypeProjection
 import kotlin.reflect.full.createType
 import kotlin.reflect.full.isSubtypeOf
@@ -17,7 +16,7 @@ fun templateGroupOf(vararg templates: MemberTemplate): TemplateGroup = { templat
 
 abstract class TemplateGroupBase : TemplateGroup {
 
-    override fun invoke(): Sequence<MemberTemplate> = buildSequence {
+    override fun invoke(): Sequence<MemberTemplate> = sequence {
         with(this@TemplateGroupBase) {
             this::class.members.filter { it.name.startsWith("f_") }.forEach {
                 require(it.parameters.size == 1) { "Member $it violates naming convention" }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
index 1042dbc449f..1b91de826a2 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
@@ -5,8 +5,6 @@
 
 package templates
 
-import kotlin.coroutines.experimental.*
-
 @DslMarker
 annotation class TemplateDsl
 
@@ -184,7 +182,7 @@ class FamilyPrimitiveMemberDefinition : MemberTemplateDefinition<PrimitiveType?>
         }
     }
 
-    override fun parametrize(): Sequence<Pair<Family, PrimitiveType?>> = buildSequence {
+    override fun parametrize(): Sequence<Pair<Family, PrimitiveType?>> = sequence {
         for ((family, primitives) in familyPrimitives) {
             if (primitives.isEmpty())
                 yield(family to null)