From dbe7f3ab0d91985950ee3c6c90820bd741e1749c Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Sat, 18 Jun 2022 13:54:23 +0200 Subject: [PATCH] [Stdlib] Suppress deprecation warnings at usages of @BuilderInference --- libraries/stdlib/src/kotlin/collections/Collections.kt | 2 ++ libraries/stdlib/src/kotlin/collections/Maps.kt | 2 ++ libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt | 2 ++ libraries/stdlib/src/kotlin/collections/Sets.kt | 2 ++ 4 files changed, 8 insertions(+) diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt index af8647cf25b..50f6ea79fec 100644 --- a/libraries/stdlib/src/kotlin/collections/Collections.kt +++ b/libraries/stdlib/src/kotlin/collections/Collections.kt @@ -169,6 +169,7 @@ public inline fun MutableList(size: Int, init: (index: Int) -> T): MutableLi @SinceKotlin("1.6") @WasExperimental(ExperimentalStdlibApi::class) @kotlin.internal.InlineOnly +@Suppress("DEPRECATION") public inline fun buildList(@BuilderInference builderAction: MutableList.() -> Unit): List { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildListInternal(builderAction) @@ -197,6 +198,7 @@ internal expect inline fun buildListInternal(builderAction: MutableList.( @SinceKotlin("1.6") @WasExperimental(ExperimentalStdlibApi::class) @kotlin.internal.InlineOnly +@Suppress("DEPRECATION") public inline fun buildList(capacity: Int, @BuilderInference builderAction: MutableList.() -> Unit): List { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildListInternal(capacity, builderAction) diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt index 8ada42ce7f9..621f1735fc7 100644 --- a/libraries/stdlib/src/kotlin/collections/Maps.kt +++ b/libraries/stdlib/src/kotlin/collections/Maps.kt @@ -139,6 +139,7 @@ public fun linkedMapOf(vararg pairs: Pair): LinkedHashMap = p @SinceKotlin("1.6") @WasExperimental(ExperimentalStdlibApi::class) @kotlin.internal.InlineOnly +@Suppress("DEPRECATION") public inline fun buildMap(@BuilderInference builderAction: MutableMap.() -> Unit): Map { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildMapInternal(builderAction) @@ -169,6 +170,7 @@ internal expect inline fun buildMapInternal(builderAction: MutableMap buildMap(capacity: Int, @BuilderInference builderAction: MutableMap.() -> Unit): Map { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildMapInternal(capacity, builderAction) diff --git a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt index cdd6334f583..f132182dac4 100644 --- a/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt +++ b/libraries/stdlib/src/kotlin/collections/SequenceBuilder.kt @@ -22,6 +22,7 @@ import kotlin.experimental.ExperimentalTypeInference * @sample samples.collections.Sequences.Building.buildFibonacciSequence */ @SinceKotlin("1.3") +@Suppress("DEPRECATION") public fun sequence(@BuilderInference block: suspend SequenceScope.() -> Unit): Sequence = Sequence { iterator(block) } /** @@ -31,6 +32,7 @@ public fun sequence(@BuilderInference block: suspend SequenceScope.() -> * @sample samples.collections.Iterables.Building.iterable */ @SinceKotlin("1.3") +@Suppress("DEPRECATION") public fun iterator(@BuilderInference block: suspend SequenceScope.() -> Unit): Iterator { val iterator = SequenceBuilderIterator() iterator.nextStep = block.createCoroutineUnintercepted(receiver = iterator, completion = iterator) diff --git a/libraries/stdlib/src/kotlin/collections/Sets.kt b/libraries/stdlib/src/kotlin/collections/Sets.kt index 606a235682e..4b65ddb9f91 100644 --- a/libraries/stdlib/src/kotlin/collections/Sets.kt +++ b/libraries/stdlib/src/kotlin/collections/Sets.kt @@ -125,6 +125,7 @@ public fun setOfNotNull(vararg elements: T?): Set { @SinceKotlin("1.6") @WasExperimental(ExperimentalStdlibApi::class) @kotlin.internal.InlineOnly +@Suppress("DEPRECATION") public inline fun buildSet(@BuilderInference builderAction: MutableSet.() -> Unit): Set { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildSetInternal(builderAction) @@ -155,6 +156,7 @@ internal expect inline fun buildSetInternal(builderAction: MutableSet.() @SinceKotlin("1.6") @WasExperimental(ExperimentalStdlibApi::class) @kotlin.internal.InlineOnly +@Suppress("DEPRECATION") public inline fun buildSet(capacity: Int, @BuilderInference builderAction: MutableSet.() -> Unit): Set { contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) } return buildSetInternal(capacity, builderAction)