diff --git a/libraries/stdlib/common/src/kotlin/collections/CollectionsH.kt b/libraries/stdlib/common/src/kotlin/collections/CollectionsH.kt index 5dfbd9cd4dd..b2650ea2c26 100644 --- a/libraries/stdlib/common/src/kotlin/collections/CollectionsH.kt +++ b/libraries/stdlib/common/src/kotlin/collections/CollectionsH.kt @@ -33,9 +33,9 @@ expect fun MutableList.sortWith(comparator: Comparator): Unit public expect fun Grouping.eachCount(): Map // public expect inline fun Grouping.eachSumOf(valueSelector: (T) -> Int): Map -internal expect fun copyToArrayImpl(collection: Collection<*>): Array +internal expect fun collectionToArray(collection: Collection<*>): Array -internal expect fun copyToArrayImpl(collection: Collection<*>, array: Array): Array +internal expect fun collectionToArray(collection: Collection<*>, array: Array): Array internal expect fun arrayOfNulls(reference: Array, size: Int): Array internal expect fun Map.toSingletonMapOrSelf(): Map diff --git a/libraries/stdlib/js/src/kotlin/collectionJs.kt b/libraries/stdlib/js/src/kotlin/collectionJs.kt index b53a069511e..1784a65b4e6 100644 --- a/libraries/stdlib/js/src/kotlin/collectionJs.kt +++ b/libraries/stdlib/js/src/kotlin/collectionJs.kt @@ -32,14 +32,12 @@ internal fun copyToArray(collection: Collection): Array { return if (collection.asDynamic().toArray !== undefined) collection.asDynamic().toArray().unsafeCast>() else - copyToArrayImpl(collection).unsafeCast>() + collectionToArray(collection).unsafeCast>() } -@JsName("copyToArrayImpl") -internal actual fun copyToArrayImpl(collection: Collection<*>): Array = collectionToArrayCommonImpl(collection) +internal actual fun collectionToArray(collection: Collection<*>): Array = collectionToArrayCommonImpl(collection) -@JsName("copyToExistingArrayImpl") -internal actual fun copyToArrayImpl(collection: Collection<*>, array: Array): Array = collectionToArrayCommonImpl(collection, array) +internal actual fun collectionToArray(collection: Collection<*>, array: Array): Array = collectionToArrayCommonImpl(collection, array) internal actual fun terminateCollectionToArray(collectionSize: Int, array: Array): Array = array diff --git a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt index e3f59ba1259..ae8aecbe009 100644 --- a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt @@ -77,12 +77,12 @@ public fun Iterable.shuffled(random: java.util.Random): List = toMutab @kotlin.internal.InlineOnly -internal actual inline fun copyToArrayImpl(collection: Collection<*>): Array = +internal actual inline fun collectionToArray(collection: Collection<*>): Array = kotlin.jvm.internal.collectionToArray(collection) @kotlin.internal.InlineOnly @Suppress("UNCHECKED_CAST") -internal actual inline fun copyToArrayImpl(collection: Collection<*>, array: Array): Array = +internal actual inline fun collectionToArray(collection: Collection<*>, array: Array): Array = kotlin.jvm.internal.collectionToArray(collection, array as Array) as Array internal actual fun terminateCollectionToArray(collectionSize: Int, array: Array): Array { diff --git a/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt b/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt index 7d4b101715f..ac24b33dc60 100644 --- a/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt +++ b/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt @@ -84,9 +84,9 @@ internal fun Array?.contentDeepHashCodeImpl(): Int { @Suppress("UNCHECKED_CAST") internal actual fun arrayOfNulls(reference: Array, size: Int): Array = arrayOfNulls(size) as Array -internal actual fun copyToArrayImpl(collection: Collection<*>): Array = collectionToArrayCommonImpl(collection) +internal actual fun collectionToArray(collection: Collection<*>): Array = collectionToArrayCommonImpl(collection) -internal actual fun copyToArrayImpl(collection: Collection<*>, array: Array): Array = collectionToArrayCommonImpl(collection, array) +internal actual fun collectionToArray(collection: Collection<*>, array: Array): Array = collectionToArrayCommonImpl(collection, array) internal actual fun terminateCollectionToArray(collectionSize: Int, array: Array): Array = array diff --git a/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt b/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt index 4b4d7f31511..9f9275435c7 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt @@ -31,7 +31,7 @@ public abstract class AbstractCollection protected constructor() : Collec * Returns new array of type `Array` with the elements of this collection. */ @JsName("toArray") - protected open fun toArray(): Array = copyToArrayImpl(this) + protected open fun toArray(): Array = collectionToArray(this) /** * Fills the provided [array] or creates new array of the same type @@ -45,5 +45,5 @@ public abstract class AbstractCollection protected constructor() : Collec * * @return An array containing all elements of this collection. */ - protected open fun toArray(array: Array): Array = copyToArrayImpl(this, array) + protected open fun toArray(array: Array): Array = collectionToArray(this, array) } diff --git a/libraries/stdlib/wasm/src/kotlin/collections/ArraysWasm.kt b/libraries/stdlib/wasm/src/kotlin/collections/ArraysWasm.kt index 45a8ff7010b..79a163d2201 100644 --- a/libraries/stdlib/wasm/src/kotlin/collections/ArraysWasm.kt +++ b/libraries/stdlib/wasm/src/kotlin/collections/ArraysWasm.kt @@ -22,4 +22,4 @@ internal fun copyToArray(collection: Collection): Array = //TODO: Find more proper way to call abstract collection's toArray @Suppress("INVISIBLE_MEMBER") collection.toArray() as Array else - copyToArrayImpl(collection) as Array \ No newline at end of file + collectionToArray(collection) as Array \ No newline at end of file