From 2100f086558a7669c4a381f9dbdc8cce5ab1ab32 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 26 Apr 2023 01:45:14 +0200 Subject: [PATCH] Make subarrayContentToString internal --- .../src/kotlin/collections/ArrayList.kt | 2 +- .../native-wasm/src/kotlin/collections/Arrays.kt | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libraries/stdlib/native-wasm/src/kotlin/collections/ArrayList.kt b/libraries/stdlib/native-wasm/src/kotlin/collections/ArrayList.kt index b68ab67f86d..22a4d9ac7e9 100644 --- a/libraries/stdlib/native-wasm/src/kotlin/collections/ArrayList.kt +++ b/libraries/stdlib/native-wasm/src/kotlin/collections/ArrayList.kt @@ -160,7 +160,7 @@ actual class ArrayList private constructor( } override fun toString(): String { - return backingArray.subarrayContentToStringImpl(offset, length) + return backingArray.subarrayContentToString(offset, length) } @Suppress("UNCHECKED_CAST") diff --git a/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt b/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt index c4213abe005..a9081ec199f 100644 --- a/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt +++ b/libraries/stdlib/native-wasm/src/kotlin/collections/Arrays.kt @@ -18,22 +18,12 @@ internal fun checkCopyOfRangeArguments(fromIndex: Int, toIndex: Int, size: Int) throw IllegalArgumentException("fromIndex ($fromIndex) is greater than toIndex ($toIndex).") } - -// TODO: internal +@kotlin.internal.InlineOnly +@PublishedApi /** * Returns a string representation of the contents of the subarray of the specified array as if it is [List]. */ -@kotlin.internal.InlineOnly -@Deprecated("This function will become internal soon.") -@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.5", hiddenSince = "1.7") -public inline fun Array.subarrayContentToString(offset: Int, length: Int): String { - return subarrayContentToStringImpl(offset, length) -} - -@kotlin.internal.InlineOnly -@PublishedApi -// TODO: Rename back to subarrayContentToString after dropping that public function -internal inline fun Array.subarrayContentToStringImpl(offset: Int, length: Int): String { +internal inline fun Array.subarrayContentToString(offset: Int, length: Int): String { val sb = StringBuilder(2 + length * 3) sb.append("[") var i = 0