From 3a8d1c4b5ed552eff7a4d9314b77ca76a5c5e9df Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Mon, 12 Apr 2021 15:44:52 +0300 Subject: [PATCH] Remove redundant @OptIn --- .../Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt | 2 -- .../runtime/src/main/kotlin/kotlin/collections/ArrayList.kt | 1 - .../runtime/src/main/kotlin/kotlin/collections/HashMap.kt | 2 -- libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt | 4 ---- libraries/stdlib/js/src/kotlin/text/utf8Encoding.kt | 1 - .../stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt | 2 -- libraries/stdlib/src/kotlin/collections/Sequences.kt | 2 +- libraries/stdlib/src/kotlin/random/Random.kt | 1 - libraries/stdlib/src/kotlin/text/Strings.kt | 2 -- libraries/stdlib/src/kotlin/time/Duration.kt | 1 - 10 files changed, 1 insertion(+), 17 deletions(-) diff --git a/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt b/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt index 299af2ac987..9f6e9b67e33 100644 --- a/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt +++ b/kotlin-native/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt @@ -571,7 +571,6 @@ public fun CPointer.toKStringFromUtf32(): String { * * Malformed byte sequences are replaced by the replacement char `\uFFFD`. */ -@OptIn(ExperimentalStdlibApi::class) @SinceKotlin("1.3") public fun ByteArray.toKString() : String { val realEndIndex = realEndIndex(this, 0, this.size) @@ -590,7 +589,6 @@ public fun ByteArray.toKString() : String { * @throws IllegalArgumentException if [startIndex] is greater than [endIndex]. * @throws CharacterCodingException if the byte array contains malformed UTF-8 byte sequence and [throwOnInvalidSequence] is true. */ -@OptIn(ExperimentalStdlibApi::class) @SinceKotlin("1.3") public fun ByteArray.toKString( startIndex: Int = 0, diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt index 01da1bd6922..068bb0cc6d6 100644 --- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt +++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt @@ -141,7 +141,6 @@ actual class ArrayList private constructor( array = array.copyOfUninitializedElements(length) } - @OptIn(ExperimentalStdlibApi::class) final actual fun ensureCapacity(minCapacity: Int) { if (backing != null) throw IllegalStateException() // just in case somebody casts subList to ArrayList if (minCapacity > array.size) { diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt index d9f52a67aec..8f86d1c17ab 100644 --- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt +++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/HashMap.kt @@ -470,10 +470,8 @@ actual class HashMap private constructor( private const val INITIAL_MAX_PROBE_DISTANCE = 2 private const val TOMBSTONE = -1 - @OptIn(ExperimentalStdlibApi::class) private fun computeHashSize(capacity: Int): Int = (capacity.coerceAtLeast(1) * 3).takeHighestOneBit() - @OptIn(ExperimentalStdlibApi::class) private fun computeShift(hashSize: Int): Int = hashSize.countLeadingZeroBits() + 1 } diff --git a/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt b/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt index f8e6d95dfbf..d826d1fd674 100644 --- a/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt +++ b/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt @@ -108,7 +108,6 @@ public actual class StringBuilder actual constructor(content: String) : Appendab @SinceKotlin("1.4") @WasExperimental(ExperimentalStdlibApi::class) actual fun append(value: CharArray): StringBuilder { - @OptIn(ExperimentalStdlibApi::class) string += value.concatToString() return this } @@ -238,7 +237,6 @@ public actual class StringBuilder actual constructor(content: String) : Appendab actual fun insert(index: Int, value: CharArray): StringBuilder { AbstractList.checkPositionIndex(index, length) - @OptIn(ExperimentalStdlibApi::class) string = string.substring(0, index) + value.concatToString() + string.substring(index) return this } @@ -492,7 +490,6 @@ public actual class StringBuilder actual constructor(content: String) : Appendab @SinceKotlin("1.4") @WasExperimental(ExperimentalStdlibApi::class) public fun appendRange(value: CharArray, startIndex: Int, endIndex: Int): StringBuilder { - @OptIn(ExperimentalStdlibApi::class) string += value.concatToString(startIndex, endIndex) return this } @@ -534,7 +531,6 @@ public actual class StringBuilder actual constructor(content: String) : Appendab public fun insertRange(index: Int, value: CharArray, startIndex: Int, endIndex: Int): StringBuilder { AbstractList.checkPositionIndex(index, this.length) - @OptIn(ExperimentalStdlibApi::class) string = string.substring(0, index) + value.concatToString(startIndex, endIndex) + string.substring(index) return this } diff --git a/libraries/stdlib/js/src/kotlin/text/utf8Encoding.kt b/libraries/stdlib/js/src/kotlin/text/utf8Encoding.kt index 8912334b42f..b389955a3e0 100644 --- a/libraries/stdlib/js/src/kotlin/text/utf8Encoding.kt +++ b/libraries/stdlib/js/src/kotlin/text/utf8Encoding.kt @@ -6,7 +6,6 @@ package kotlin.text /** Returns the negative [size] if [throwOnMalformed] is false, throws [CharacterCodingException] otherwise. */ -@OptIn(ExperimentalStdlibApi::class) private fun malformed(size: Int, index: Int, throwOnMalformed: Boolean): Int { if (throwOnMalformed) throw CharacterCodingException("Malformed sequence starting at ${index - 1}") return -size diff --git a/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt b/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt index 16f5ffff796..6185481c5db 100644 --- a/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt +++ b/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt @@ -436,10 +436,8 @@ internal class MapBuilder private constructor( private const val INITIAL_MAX_PROBE_DISTANCE = 2 private const val TOMBSTONE = -1 - @OptIn(ExperimentalStdlibApi::class) private fun computeHashSize(capacity: Int): Int = (capacity.coerceAtLeast(1) * 3).takeHighestOneBit() - @OptIn(ExperimentalStdlibApi::class) private fun computeShift(hashSize: Int): Int = hashSize.countLeadingZeroBits() + 1 } diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt index 2c45ff2cf71..d4073d1969a 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequences.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt @@ -140,7 +140,7 @@ public fun Sequence.shuffled(random: Random): Sequence = sequence { val buffer = toMutableList() while (buffer.isNotEmpty()) { val j = random.nextInt(buffer.size) - val last = @OptIn(ExperimentalStdlibApi::class) buffer.removeLast() + val last = buffer.removeLast() val value = if (j < buffer.size) buffer.set(j, last) else last yield(value) } diff --git a/libraries/stdlib/src/kotlin/random/Random.kt b/libraries/stdlib/src/kotlin/random/Random.kt index 903bc3528d9..dd05987cd76 100644 --- a/libraries/stdlib/src/kotlin/random/Random.kt +++ b/libraries/stdlib/src/kotlin/random/Random.kt @@ -369,7 +369,6 @@ public fun Random.nextLong(range: LongRange): Long = when { internal expect fun defaultPlatformRandom(): Random internal expect fun doubleFromParts(hi26: Int, low27: Int): Double -@OptIn(ExperimentalStdlibApi::class) internal fun fastLog2(value: Int): Int = 31 - value.countLeadingZeroBits() /** Takes upper [bitCount] bits (0..32) from this number. */ diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 027e55ae47b..da80ca575be 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -500,7 +500,6 @@ public fun String.substringAfterLast(delimiter: String, missingDelimiterValue: S * @param startIndex the index of the first character to be replaced. * @param endIndex the index of the first character after the replacement to keep in the string. */ -@OptIn(ExperimentalStdlibApi::class) public fun CharSequence.replaceRange(startIndex: Int, endIndex: Int, replacement: CharSequence): CharSequence { if (endIndex < startIndex) throw IndexOutOfBoundsException("End index ($endIndex) is less than start index ($startIndex).") @@ -546,7 +545,6 @@ public inline fun String.replaceRange(range: IntRange, replacement: CharSequence * * [endIndex] is not included in the removed part. */ -@OptIn(ExperimentalStdlibApi::class) public fun CharSequence.removeRange(startIndex: Int, endIndex: Int): CharSequence { if (endIndex < startIndex) throw IndexOutOfBoundsException("End index ($endIndex) is less than start index ($startIndex).") diff --git a/libraries/stdlib/src/kotlin/time/Duration.kt b/libraries/stdlib/src/kotlin/time/Duration.kt index 6aa5e9c4f1c..3092c0b7a99 100644 --- a/libraries/stdlib/src/kotlin/time/Duration.kt +++ b/libraries/stdlib/src/kotlin/time/Duration.kt @@ -725,7 +725,6 @@ public value class Duration internal constructor(private val rawValue: Long) : C * * @sample samples.time.Durations.toIsoString */ - @OptIn(ExperimentalStdlibApi::class) public fun toIsoString(): String = buildString { if (isNegative()) append('-') append("PT")