From 1fc5c39c22a038971c0fc1404505c7d409aaf22a Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 12 May 2015 13:35:05 +0300
Subject: [PATCH] Remove overload of joinToString with 5 parameters and it's
 usage from java code.

---
 core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java | 2 +-
 libraries/stdlib/src/generated/_Strings.kt                      | 1 -
 libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
index 6e9a6610b24..7c47febe51e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
@@ -463,7 +463,7 @@ public class ErrorUtils {
 
         @Override
         public String toString() {
-            return constructor.toString() + (arguments.isEmpty() ? "" : joinToString(arguments, ", ", "<", ">", -1, "..."));
+            return constructor.toString() + (arguments.isEmpty() ? "" : joinToString(arguments, ", ", "<", ">", -1, "...", null));
         }
     }
 
diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt
index 44ba5aaa246..6b059681ef5 100644
--- a/libraries/stdlib/src/generated/_Strings.kt
+++ b/libraries/stdlib/src/generated/_Strings.kt
@@ -338,7 +338,6 @@ public fun ShortArray.joinToString(separator: String = ", ", prefix: String = ""
  * If the collection could be huge, you can specify a non-negative value of [limit], in which case only the first [limit]
  * elements will be appended, followed by the [truncated] string (which defaults to "...").
  */
-kotlin.jvm.overloads
 public fun <T> Iterable<T>.joinToString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "...", transform: ((T) -> String)? = null): String {
     return joinTo(StringBuilder(), separator, prefix, postfix, limit, truncated, transform).toString()
 }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt
index 6c89c670e8f..dd1fdeb8902 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt
@@ -63,7 +63,6 @@ fun strings(): List<GenericFunction> {
 
         exclude(Strings)
         returns("String")
-        annotations("kotlin.jvm.overloads", Iterables)
         body {
             """
             return joinTo(StringBuilder(), separator, prefix, postfix, limit, truncated, transform).toString()