diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt index 7807803f6f5..8670d7e4349 100644 --- a/libraries/stdlib/src/generated/_Strings.kt +++ b/libraries/stdlib/src/generated/_Strings.kt @@ -7,61 +7,6 @@ package kotlin import java.util.* -deprecated("Use joinTo() instead") -public fun Array.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun BooleanArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun ByteArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun CharArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun DoubleArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun FloatArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun IntArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun LongArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun ShortArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun Iterable.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinTo() instead") -public fun Stream.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { - joinTo(buffer, separator, prefix, postfix, limit, truncated) -} - /** * Appends the string from all the elements separated using the *separator* and using the given *prefix* and *postfix* if supplied * If a collection could be huge you can specify a non-negative value of *limit* which will only show a subset of the collection then it will @@ -381,58 +326,3 @@ public fun Stream.joinToString(separator: String = ", ", prefix: String = return joinTo(StringBuilder(), separator, prefix, postfix, limit, truncated).toString() } -deprecated("Use joinToString() instead") -public fun Array.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun BooleanArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun ByteArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun CharArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun DoubleArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun FloatArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun IntArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun LongArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun ShortArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun Iterable.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - -deprecated("Use joinToString() instead") -public fun Stream.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { - return joinToString(separator, prefix, postfix, limit, truncated) -} - diff --git a/libraries/stdlib/src/kotlin/deprecated/Strings.kt b/libraries/stdlib/src/kotlin/deprecated/Strings.kt new file mode 100644 index 00000000000..543d882ade2 --- /dev/null +++ b/libraries/stdlib/src/kotlin/deprecated/Strings.kt @@ -0,0 +1,113 @@ +package kotlin + + +deprecated("Use joinToString() instead") +public fun Array.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun BooleanArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun ByteArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun CharArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun DoubleArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun FloatArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun IntArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun LongArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun ShortArray.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun Iterable.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinToString() instead") +public fun Stream.makeString(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { + return joinToString(separator, prefix, postfix, limit, truncated) +} + + +deprecated("Use joinTo() instead") +public fun Array.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun BooleanArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun ByteArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun CharArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun DoubleArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun FloatArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun IntArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun LongArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun ShortArray.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun Iterable.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} + +deprecated("Use joinTo() instead") +public fun Stream.appendString(buffer: Appendable, separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): Unit { + joinTo(buffer, separator, prefix, postfix, limit, truncated) +} diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt index 4c918d4359d..df044289994 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt @@ -5,17 +5,6 @@ import templates.Family.* fun strings(): List { val templates = arrayListOf() - templates add f("appendString(buffer: Appendable, separator: String = \", \", prefix: String = \"\", postfix: String = \"\", limit: Int = -1, truncated: String = \"...\")") { - deprecate{"Use joinTo() instead"} - returns { "Unit" } - exclude(Strings) - body { - """ - joinTo(buffer, separator, prefix, postfix, limit, truncated) - """ - } - } - templates add f("joinTo(buffer: A, separator: String = \", \", prefix: String = \"\", postfix: String = \"\", limit: Int = -1, truncated: String = \"...\")") { doc { """ @@ -62,17 +51,6 @@ fun strings(): List { } } - templates add f("makeString(separator: String = \", \", prefix: String = \"\", postfix: String = \"\", limit: Int = -1, truncated: String = \"...\")") { - deprecate{"Use joinToString() instead"} - exclude(Strings) - returns("String") - body { - """ - return joinToString(separator, prefix, postfix, limit, truncated) - """ - } - } - templates add f("joinToString(separator: String = \", \", prefix: String = \"\", postfix: String = \"\", limit: Int = -1, truncated: String = \"...\")") { doc { """