From be11394adf7f32aa1e23f23f56fd11243e7d503c Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 20 Apr 2015 20:17:49 +0300 Subject: [PATCH] Rename copyToArray() to toTypedArray(). --- js/js.libraries/src/core/kotlin.kt | 2 +- libraries/stdlib/src/kotlin/collections/ArraysJVM.kt | 7 +++++-- libraries/stdlib/src/kotlin/deprecated/Arrays.kt | 3 +++ libraries/stdlib/src/kotlin/text/StringsJVM.kt | 2 +- libraries/stdlib/test/collections/CollectionJVMTest.kt | 2 +- libraries/stdlib/test/collections/CollectionTest.kt | 2 +- libraries/stdlib/test/js/javautilCollectionsTest.kt | 2 +- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 +- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 6 +++--- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/js/js.libraries/src/core/kotlin.kt b/js/js.libraries/src/core/kotlin.kt index 7c79a5ddcfa..b27b133f014 100644 --- a/js/js.libraries/src/core/kotlin.kt +++ b/js/js.libraries/src/core/kotlin.kt @@ -32,4 +32,4 @@ library public fun booleanArrayOf(vararg content : Boolean): BooleanArray = noImpl library("copyToArray") -public fun Collection.copyToArray(): Array = noImpl +public fun Collection.toTypedArray(): Array = noImpl diff --git a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt index f441fe47362..fa09c699a8b 100644 --- a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt @@ -77,9 +77,12 @@ public fun ByteArray.toString(charset: String): String = String(this, charset) public fun ByteArray.toString(charset: Charset): String = String(this, charset) /** - * Returns an array containing the elements of this collection. + * Returns a *typed* array containing all of the elements of this collection. + * + * Allocates an array of runtime type `T` having its size equal to the size of this collection + * and populates the array with the elements of this collection. */ -[Intrinsic("kotlin.collections.copyToArray")] public fun Collection.copyToArray(): Array = +[Intrinsic("kotlin.collections.copyToArray")] public fun Collection.toTypedArray(): Array = throw UnsupportedOperationException() /** Returns the array if it's not null, or an empty array otherwise. */ diff --git a/libraries/stdlib/src/kotlin/deprecated/Arrays.kt b/libraries/stdlib/src/kotlin/deprecated/Arrays.kt index cc198451aaa..7a07fecdb9c 100644 --- a/libraries/stdlib/src/kotlin/deprecated/Arrays.kt +++ b/libraries/stdlib/src/kotlin/deprecated/Arrays.kt @@ -36,3 +36,6 @@ inline public fun byteArray(vararg content : Byte) : ByteArray = byteAr suppress("NOTHING_TO_INLINE") deprecated("Use booleanArrayOf() instead.") inline public fun booleanArray(vararg content : Boolean) : BooleanArray = booleanArrayOf(*content) + +deprecated("Use toTypedArray() instead.") +inline public fun Collection.copyToArray(): Array = toTypedArray() \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt index fc12d0459d2..bdcaafcd293 100644 --- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt @@ -94,7 +94,7 @@ public fun String.split(regex: Pattern, limit: Int = 0): List = regex.sp * Splits this string around matches of the given regular expression. */ deprecated("Convert an argument to regex with toRegex or use splitBy instead.") -public fun String.split(regex: String): Array = split(regex.toRegex()).copyToArray() +public fun String.split(regex: String): Array = split(regex.toRegex()).toTypedArray() /** diff --git a/libraries/stdlib/test/collections/CollectionJVMTest.kt b/libraries/stdlib/test/collections/CollectionJVMTest.kt index b06de77e5c0..066372a174d 100644 --- a/libraries/stdlib/test/collections/CollectionJVMTest.kt +++ b/libraries/stdlib/test/collections/CollectionJVMTest.kt @@ -91,7 +91,7 @@ class CollectionJVMTest { test fun toArray() { val data = listOf("foo", "bar") - val arr = data.copyToArray() + val arr = data.toTypedArray() println("Got array ${arr}") assertEquals(2, arr.size()) todo { diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index 99430078631..571c260f240 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -286,7 +286,7 @@ class CollectionTest { test fun copyToArray() { val data = listOf("foo", "bar") - val arr = data.copyToArray() + val arr = data.toTypedArray() println("Got array ${arr}") assertEquals(2, arr.size()) todo { diff --git a/libraries/stdlib/test/js/javautilCollectionsTest.kt b/libraries/stdlib/test/js/javautilCollectionsTest.kt index 81658966d30..d5aae6146db 100644 --- a/libraries/stdlib/test/js/javautilCollectionsTest.kt +++ b/libraries/stdlib/test/js/javautilCollectionsTest.kt @@ -31,7 +31,7 @@ class JavautilCollectionsTest { } test fun collectionToArray() { - val array = TEST_LIST.copyToArray() + val array = TEST_LIST.toTypedArray() assertEquals(array.toList(), TEST_LIST) } } diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 4dfd6b6eba3..e8889d02eee 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -196,7 +196,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile