From 4fa5d9cb48ae021f17a0522e2fde7b44f8ad608c Mon Sep 17 00:00:00 2001
From: Ilya Ryzhenkov <orangy@jetbrains.com>
Date: Fri, 13 Mar 2015 19:30:28 +0300
Subject: [PATCH] Fix double "deprecated" annotation in generated sources which
 confuses DX compiler.

---
 libraries/stdlib/src/generated/_Elements.kt               | 4 ++--
 libraries/stdlib/src/generated/_Mapping.kt                | 1 -
 libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/stdlib/src/generated/_Elements.kt b/libraries/stdlib/src/generated/_Elements.kt
index 3582b061ad4..aa2080a7749 100644
--- a/libraries/stdlib/src/generated/_Elements.kt
+++ b/libraries/stdlib/src/generated/_Elements.kt
@@ -851,7 +851,7 @@ public inline fun <T> Sequence<T>.first(predicate: (T) -> Boolean): T {
 
 deprecated("Migrate to using Sequence<T> and respective functions")
 /**
- * "Returns the first element matching the given [predicate].
+ * Returns the first element matching the given [predicate].
  * @throws NoSuchElementException if no such element is found.
  */
 public inline fun <T> Stream<T>.first(predicate: (T) -> Boolean): T {
@@ -1098,7 +1098,7 @@ public inline fun <T> Sequence<T>.firstOrNull(predicate: (T) -> Boolean): T? {
 
 deprecated("Migrate to using Sequence<T> and respective functions")
 /**
- * Returns first element matching the given [predicate], or `null` if element was not found
+ * Returns the first element matching the given [predicate], or `null` if element was not found
  */
 public inline fun <T> Stream<T>.firstOrNull(predicate: (T) -> Boolean): T? {
     for (element in this) if (predicate(element)) return element
diff --git a/libraries/stdlib/src/generated/_Mapping.kt b/libraries/stdlib/src/generated/_Mapping.kt
index f4710afc6af..13bc8722ae8 100644
--- a/libraries/stdlib/src/generated/_Mapping.kt
+++ b/libraries/stdlib/src/generated/_Mapping.kt
@@ -1284,7 +1284,6 @@ public fun <T> Sequence<T>.withIndices(): Sequence<Pair<Int, T>> {
 }
 
 
-deprecated("Migrate to using Sequence<T> and respective functions")
 /**
  * Returns a stream containing pairs of each element of the original collection and their index
  */
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
index f015a581ec3..88dc1ae5074 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
@@ -174,7 +174,8 @@ class GenericFunction(val signature: String, val keyword: String = "fun") : Comp
             }.toString()
             builder.append(text)
             builder.appendln()
-            builder.appendln("deprecated(\"Migrate to using Sequence<T> and respective functions\")")
+            if (deprecates[f] == null && deprecate.isEmpty())
+                builder.appendln("deprecated(\"Migrate to using Sequence<T> and respective functions\")")
             val streamText = text
                     .replace("Sequence", "Stream")
                     .replace("sequence", "stream")