Promote collection builders to stable #KT-47421

This commit is contained in:
Abduqodiri Qurbonzoda
2021-09-21 11:25:28 +00:00
committed by Space
parent 72ab6d5e7e
commit 261d0c2783
19 changed files with 39 additions and 82 deletions
@@ -21,7 +21,6 @@ public fun <T> listOf(element: T): List<T> = java.util.Collections.singletonList
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E> {
return build(createListBuilder<E>().apply(builderAction))
@@ -29,7 +28,6 @@ internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.(
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
return build(createListBuilder<E>(capacity).apply(builderAction))
@@ -37,21 +35,18 @@ internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: M
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> createListBuilder(): MutableList<E> {
return ListBuilder<E>()
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> createListBuilder(capacity: Int): MutableList<E> {
return ListBuilder<E>(capacity)
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> build(builder: MutableList<E>): List<E> {
return (builder as ListBuilder<E>).build()
}
@@ -28,7 +28,6 @@ public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = java.util.Collections.sin
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
return build(createMapBuilder<K, V>().apply(builderAction))
@@ -36,7 +35,6 @@ internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <K, V> buildMapInternal(capacity: Int, builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
return build(createMapBuilder<K, V>(capacity).apply(builderAction))
@@ -44,21 +42,18 @@ internal actual inline fun <K, V> buildMapInternal(capacity: Int, builderAction:
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <K, V> createMapBuilder(): MutableMap<K, V> {
return MapBuilder()
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <K, V> createMapBuilder(capacity: Int): MutableMap<K, V> {
return MapBuilder(capacity)
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <K, V> build(builder: MutableMap<K, V>): Map<K, V> {
return (builder as MapBuilder<K, V>).build()
}
@@ -19,7 +19,6 @@ public fun <T> setOf(element: T): Set<T> = java.util.Collections.singleton(eleme
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.() -> Unit): Set<E> {
return build(createSetBuilder<E>().apply(builderAction))
@@ -27,7 +26,6 @@ internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
@kotlin.internal.InlineOnly
internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E> {
return build(createSetBuilder<E>(capacity).apply(builderAction))
@@ -35,21 +33,18 @@ internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: Mu
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> createSetBuilder(): MutableSet<E> {
return SetBuilder()
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> createSetBuilder(capacity: Int): MutableSet<E> {
return SetBuilder(capacity)
}
@PublishedApi
@SinceKotlin("1.3")
@ExperimentalStdlibApi
internal fun <E> build(builder: MutableSet<E>): Set<E> {
return (builder as SetBuilder<E>).build()
}
@@ -397,7 +397,6 @@ internal class SerializedCollection(
}
}
@OptIn(ExperimentalStdlibApi::class)
override fun readExternal(input: java.io.ObjectInput) {
val flags = input.readByte().toInt()
val tag = flags and 1
@@ -651,7 +651,6 @@ private class SerializedMap(
}
}
@OptIn(ExperimentalStdlibApi::class)
override fun readExternal(input: java.io.ObjectInput) {
val flags = input.readByte().toInt()
if (flags != 0) {