azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

joinTo/joinToString: Do not call toString on elements that are already CharSequence or Char.

Browse Source 
#KT-15557
This commit is contained in:
Ilya Gorbunov
2017-01-12 00:55:17 +03:00
parent 0c27e07e8c
commit 80f2efb625
13 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Arrays.kt
+2 -5
View File
@@ -12241,10 +12241,7 @@ public fun <T, A : Appendable> Array<out T>.joinTo(buffer: A, separator: CharSeq
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
@@ -12428,7 +12425,7 @@ public fun <A : Appendable> CharArray.joinTo(buffer: A, separator: CharSequence
if (transform != null)
buffer.append(transform(element))
else
buffer.append(element.toString())
buffer.append(element)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/generated/_Collections.kt
+1 -4
View File
@@ -2011,10 +2011,7 @@ public fun <T, A : Appendable> Iterable<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/generated/_Sequences.kt
+1 -4
View File
@@ -1290,10 +1290,7 @@ public fun <T, A : Appendable> Sequence<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/kotlin/text/StringBuilder.kt
+10
View File
@@ -53,3 +53,13 @@ public fun StringBuilder.append(vararg value: Any?): StringBuilder {
@kotlin.jvm.JvmVersion
@kotlin.internal.InlineOnly
public inline operator fun StringBuilder.set(index: Int, value: Char): Unit = this.setCharAt(index, value)
internal fun <T> Appendable.appendElement(element: T, transform: ((T) -> CharSequence)?) {
when {
transform != null -> append(transform(element))
element is CharSequence? -> append(element)
element is Char -> append(element)
else -> append(element.toString())
}
}