Google Git
Sign in
pigweed/third_party/github/JetBrains/kotlin/refs/heads/upstream/rrr/1.7.0/stdlib-docs-inline^!/.
commit
d8b0dbe71bbeb84ba0fbdac87801c8c6f4eed4c9
[log]
author
Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Thu Oct 21 02:44:19 2021 +0300
committer
Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Thu Jun 09 17:17:19 2022 +0300
tree
2c583def2fec078a60e0974449c00bbbb5cba9c3
parent
e4b2a8121b6a8bf6d2a5a3405053945b1ac9db68 [diff]
Partially revert "replace inline class -> @JvmInline value class in stdlib"

Partially reverts the commit #d67e4f0c

diff --git a/generators/builtins/unsignedTypes.kt b/generators/builtins/unsignedTypes.kt
index f7d3772..1a3404a 100644
--- a/generators/builtins/unsignedTypes.kt
+++ b/generators/builtins/unsignedTypes.kt

@@ -66,8 +66,8 @@
 
         out.println("@SinceKotlin(\"1.5\")")
         out.println("@WasExperimental(ExperimentalUnsignedTypes::class)")
-        out.println("@JvmInline")
-        out.println("public value class $className @PublishedApi internal constructor(@PublishedApi internal val data: $storageType) : Comparable<$className> {")
+        out.println("""@Suppress("INLINE_CLASS_DEPRECATED")""")
+        out.println("public inline class $className @PublishedApi internal constructor(@PublishedApi internal val data: $storageType) : Comparable<$className> {")
         out.println()
         out.println("""    companion object {
         /**
@@ -452,8 +452,8 @@
 
         out.println("@SinceKotlin(\"1.3\")")
         out.println("@ExperimentalUnsignedTypes")
-        out.println("@JvmInline")
-        out.println("public value class $arrayType")
+        out.println("""@Suppress("INLINE_CLASS_DEPRECATED")""")
+        out.println("public inline class $arrayType")
         out.println("@PublishedApi")
         out.println("internal constructor(@PublishedApi internal val storage: $storageArrayType) : Collection<$elementType> {")
         out.println(

diff --git a/libraries/stdlib/api/js-v1/kotlin.kt b/libraries/stdlib/api/js-v1/kotlin.kt
index 915c48b..5744349 100644
--- a/libraries/stdlib/api/js-v1/kotlin.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.kt

@@ -2147,7 +2147,6 @@
 }
 
 @kotlin.SinceKotlin(version = "1.3")
-@kotlin.jvm.JvmInline
 public final inline class Result<out T> : kotlin.io.Serializable {
     public final val isFailure: kotlin.Boolean { get; }
 
@@ -2397,7 +2396,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UByte : kotlin.Comparable<kotlin.UByte> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UByte): kotlin.UByte
@@ -2565,7 +2563,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UByteArray : kotlin.collections.Collection<kotlin.UByte> {
     public constructor UByteArray(size: kotlin.Int)
 
@@ -2592,7 +2589,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UInt : kotlin.Comparable<kotlin.UInt> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UInt): kotlin.UInt
@@ -2766,7 +2762,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UIntArray : kotlin.collections.Collection<kotlin.UInt> {
     public constructor UIntArray(size: kotlin.Int)
 
@@ -2793,7 +2788,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class ULong : kotlin.Comparable<kotlin.ULong> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.ULong): kotlin.ULong
@@ -2967,7 +2961,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class ULongArray : kotlin.collections.Collection<kotlin.ULong> {
     public constructor ULongArray(size: kotlin.Int)
 
@@ -2994,7 +2987,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UShort : kotlin.Comparable<kotlin.UShort> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UShort): kotlin.UShort
@@ -3162,7 +3154,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UShortArray : kotlin.collections.Collection<kotlin.UShort> {
     public constructor UShortArray(size: kotlin.Int)
 

diff --git a/libraries/stdlib/api/js-v1/kotlin.time.kt b/libraries/stdlib/api/js-v1/kotlin.time.kt
index 1ca9965..63a1bd7 100644
--- a/libraries/stdlib/api/js-v1/kotlin.time.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.time.kt

@@ -208,7 +208,6 @@
 
 @kotlin.SinceKotlin(version = "1.6")
 @kotlin.WasExperimental(markerClass = {kotlin.time.ExperimentalTime::class})
-@kotlin.jvm.JvmInline
 public final inline class Duration : kotlin.Comparable<kotlin.time.Duration> {
     public final val absoluteValue: kotlin.time.Duration { get; }
 

diff --git a/libraries/stdlib/api/js/kotlin.kt b/libraries/stdlib/api/js/kotlin.kt
index 01c202f..f0ce39d 100644
--- a/libraries/stdlib/api/js/kotlin.kt
+++ b/libraries/stdlib/api/js/kotlin.kt

@@ -2137,7 +2137,6 @@
 }
 
 @kotlin.SinceKotlin(version = "1.3")
-@kotlin.jvm.JvmInline
 public final inline class Result<out T> : kotlin.io.Serializable {
     public final val isFailure: kotlin.Boolean { get; }
 
@@ -2401,7 +2400,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UByte : kotlin.Comparable<kotlin.UByte> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UByte): kotlin.UByte
@@ -2569,7 +2567,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UByteArray : kotlin.collections.Collection<kotlin.UByte> {
     public constructor UByteArray(size: kotlin.Int)
 
@@ -2596,7 +2593,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UInt : kotlin.Comparable<kotlin.UInt> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UInt): kotlin.UInt
@@ -2770,7 +2766,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UIntArray : kotlin.collections.Collection<kotlin.UInt> {
     public constructor UIntArray(size: kotlin.Int)
 
@@ -2797,7 +2792,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class ULong : kotlin.Comparable<kotlin.ULong> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.ULong): kotlin.ULong
@@ -2971,7 +2965,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class ULongArray : kotlin.collections.Collection<kotlin.ULong> {
     public constructor ULongArray(size: kotlin.Int)
 
@@ -2998,7 +2991,6 @@
 
 @kotlin.SinceKotlin(version = "1.5")
 @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalUnsignedTypes::class})
-@kotlin.jvm.JvmInline
 public final inline class UShort : kotlin.Comparable<kotlin.UShort> {
     @kotlin.internal.InlineOnly
     public final inline infix fun and(other: kotlin.UShort): kotlin.UShort
@@ -3166,7 +3158,6 @@
 
 @kotlin.SinceKotlin(version = "1.3")
 @kotlin.ExperimentalUnsignedTypes
-@kotlin.jvm.JvmInline
 public final inline class UShortArray : kotlin.collections.Collection<kotlin.UShort> {
     public constructor UShortArray(size: kotlin.Int)
 

diff --git a/libraries/stdlib/api/js/kotlin.time.kt b/libraries/stdlib/api/js/kotlin.time.kt
index 1ca9965..63a1bd7 100644
--- a/libraries/stdlib/api/js/kotlin.time.kt
+++ b/libraries/stdlib/api/js/kotlin.time.kt

@@ -208,7 +208,6 @@
 
 @kotlin.SinceKotlin(version = "1.6")
 @kotlin.WasExperimental(markerClass = {kotlin.time.ExperimentalTime::class})
-@kotlin.jvm.JvmInline
 public final inline class Duration : kotlin.Comparable<kotlin.time.Duration> {
     public final val absoluteValue: kotlin.time.Duration { get; }
 

diff --git a/libraries/stdlib/src/kotlin/time/Duration.kt b/libraries/stdlib/src/kotlin/time/Duration.kt
index b623365..ef64960 100644
--- a/libraries/stdlib/src/kotlin/time/Duration.kt
+++ b/libraries/stdlib/src/kotlin/time/Duration.kt

@@ -31,8 +31,8 @@
  */
 @SinceKotlin("1.6")
 @WasExperimental(ExperimentalTime::class)
-@JvmInline
-public value class Duration internal constructor(private val rawValue: Long) : Comparable<Duration> {
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class Duration internal constructor(private val rawValue: Long) : Comparable<Duration> {
 
     private val value: Long get() = rawValue shr 1
     private inline val unitDiscriminator: Int get() = rawValue.toInt() and 1

diff --git a/libraries/stdlib/src/kotlin/util/Result.kt b/libraries/stdlib/src/kotlin/util/Result.kt
index 1650072..fe2d0168 100644
--- a/libraries/stdlib/src/kotlin/util/Result.kt
+++ b/libraries/stdlib/src/kotlin/util/Result.kt

@@ -18,8 +18,8 @@
  * or a failure with an arbitrary [Throwable] exception.
  */
 @SinceKotlin("1.3")
-@JvmInline
-public value class Result<out T> @PublishedApi internal constructor(
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class Result<out T> @PublishedApi internal constructor(
     @PublishedApi
     internal val value: Any?
 ) : Serializable {

diff --git a/libraries/stdlib/unsigned/src/kotlin/UByte.kt b/libraries/stdlib/unsigned/src/kotlin/UByte.kt
index aed55a0..46e5a51 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UByte.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UByte.kt

@@ -12,8 +12,8 @@
 
 @SinceKotlin("1.5")
 @WasExperimental(ExperimentalUnsignedTypes::class)
-@JvmInline
-public value class UByte @PublishedApi internal constructor(@PublishedApi internal val data: Byte) : Comparable<UByte> {
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UByte @PublishedApi internal constructor(@PublishedApi internal val data: Byte) : Comparable<UByte> {
 
     companion object {
         /**

diff --git a/libraries/stdlib/unsigned/src/kotlin/UByteArray.kt b/libraries/stdlib/unsigned/src/kotlin/UByteArray.kt
index 27e4d68..bb2d009 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UByteArray.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UByteArray.kt

@@ -11,8 +11,8 @@
 
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
-@JvmInline
-public value class UByteArray
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UByteArray
 @PublishedApi
 internal constructor(@PublishedApi internal val storage: ByteArray) : Collection<UByte> {
 

diff --git a/libraries/stdlib/unsigned/src/kotlin/UInt.kt b/libraries/stdlib/unsigned/src/kotlin/UInt.kt
index 3f553ea..31bf08d 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UInt.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UInt.kt

@@ -12,8 +12,8 @@
 
 @SinceKotlin("1.5")
 @WasExperimental(ExperimentalUnsignedTypes::class)
-@JvmInline
-public value class UInt @PublishedApi internal constructor(@PublishedApi internal val data: Int) : Comparable<UInt> {
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UInt @PublishedApi internal constructor(@PublishedApi internal val data: Int) : Comparable<UInt> {
 
     companion object {
         /**

diff --git a/libraries/stdlib/unsigned/src/kotlin/UIntArray.kt b/libraries/stdlib/unsigned/src/kotlin/UIntArray.kt
index 8490dea..c2806dc 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UIntArray.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UIntArray.kt

@@ -11,8 +11,8 @@
 
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
-@JvmInline
-public value class UIntArray
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UIntArray
 @PublishedApi
 internal constructor(@PublishedApi internal val storage: IntArray) : Collection<UInt> {
 

diff --git a/libraries/stdlib/unsigned/src/kotlin/ULong.kt b/libraries/stdlib/unsigned/src/kotlin/ULong.kt
index 4694945..24bf108 100644
--- a/libraries/stdlib/unsigned/src/kotlin/ULong.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/ULong.kt

@@ -12,8 +12,8 @@
 
 @SinceKotlin("1.5")
 @WasExperimental(ExperimentalUnsignedTypes::class)
-@JvmInline
-public value class ULong @PublishedApi internal constructor(@PublishedApi internal val data: Long) : Comparable<ULong> {
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class ULong @PublishedApi internal constructor(@PublishedApi internal val data: Long) : Comparable<ULong> {
 
     companion object {
         /**

diff --git a/libraries/stdlib/unsigned/src/kotlin/ULongArray.kt b/libraries/stdlib/unsigned/src/kotlin/ULongArray.kt
index 44430b7..d770b3c 100644
--- a/libraries/stdlib/unsigned/src/kotlin/ULongArray.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/ULongArray.kt

@@ -11,8 +11,8 @@
 
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
-@JvmInline
-public value class ULongArray
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class ULongArray
 @PublishedApi
 internal constructor(@PublishedApi internal val storage: LongArray) : Collection<ULong> {
 

diff --git a/libraries/stdlib/unsigned/src/kotlin/UShort.kt b/libraries/stdlib/unsigned/src/kotlin/UShort.kt
index 286cf5a..afd8fda 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UShort.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UShort.kt

@@ -12,8 +12,8 @@
 
 @SinceKotlin("1.5")
 @WasExperimental(ExperimentalUnsignedTypes::class)
-@JvmInline
-public value class UShort @PublishedApi internal constructor(@PublishedApi internal val data: Short) : Comparable<UShort> {
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UShort @PublishedApi internal constructor(@PublishedApi internal val data: Short) : Comparable<UShort> {
 
     companion object {
         /**

diff --git a/libraries/stdlib/unsigned/src/kotlin/UShortArray.kt b/libraries/stdlib/unsigned/src/kotlin/UShortArray.kt
index 4e27f43..f3f4adb 100644
--- a/libraries/stdlib/unsigned/src/kotlin/UShortArray.kt
+++ b/libraries/stdlib/unsigned/src/kotlin/UShortArray.kt

@@ -11,8 +11,8 @@
 
 @SinceKotlin("1.3")
 @ExperimentalUnsignedTypes
-@JvmInline
-public value class UShortArray
+@Suppress("INLINE_CLASS_DEPRECATED")
+public inline class UShortArray
 @PublishedApi
 internal constructor(@PublishedApi internal val storage: ShortArray) : Collection<UShort> {