From 68971e2162d7eba36c4d8fac5bf3d5c864c42f41 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 12 Jan 2016 22:57:16 +0300 Subject: [PATCH] Remove redundant JvmName annotations for Array.copyOf, copyOfRange --- libraries/stdlib/src/generated/_Arrays.kt | 3 --- .../tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt index b03b7a07148..efe6229b7a7 100644 --- a/libraries/stdlib/src/generated/_Arrays.kt +++ b/libraries/stdlib/src/generated/_Arrays.kt @@ -11257,7 +11257,6 @@ public fun ShortArray.binarySearch(element: Short, fromIndex: Int = 0, toIndex: * Returns new array which is a copy of the original array. */ @kotlin.jvm.JvmVersion -@JvmName("mutableCopyOf") public fun Array.copyOf(): Array { return Arrays.copyOf(this, size) } @@ -11330,7 +11329,6 @@ public fun ShortArray.copyOf(): ShortArray { * Returns new array which is a copy of the original array. */ @kotlin.jvm.JvmVersion -@JvmName("mutableCopyOf") public fun Array.copyOf(newSize: Int): Array { return Arrays.copyOf(this, newSize) } @@ -11403,7 +11401,6 @@ public fun ShortArray.copyOf(newSize: Int): ShortArray { * Returns new array which is a copy of range of original array. */ @kotlin.jvm.JvmVersion -@JvmName("mutableCopyOfRange") public fun Array.copyOfRange(fromIndex: Int, toIndex: Int): Array { return Arrays.copyOfRange(this, fromIndex, toIndex) } diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt index 5f5ae7b6632..21a0bf2f81a 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt @@ -60,7 +60,6 @@ fun specialJVM(): List { only(InvariantArraysOfObjects, ArraysOfPrimitives) doc { "Returns new array which is a copy of range of original array." } returns("SELF") - annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOfRange")"""} body { "return Arrays.copyOfRange(this, fromIndex, toIndex)" } @@ -70,7 +69,6 @@ fun specialJVM(): List { only(InvariantArraysOfObjects, ArraysOfPrimitives) doc { "Returns new array which is a copy of the original array." } returns("SELF") - annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOf")"""} body { "return Arrays.copyOf(this, size)" } @@ -81,12 +79,10 @@ fun specialJVM(): List { only(InvariantArraysOfObjects, ArraysOfPrimitives) doc { "Returns new array which is a copy of the original array." } returns("SELF") + returns(InvariantArraysOfObjects) { "Array" } body { "return Arrays.copyOf(this, newSize)" } - returns(ArraysOfObjects) { "Array" } - returns(InvariantArraysOfObjects) { "Array" } - annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOf")"""} } templates add f("fill(element: T, fromIndex: Int = 0, toIndex: Int = size)") {