azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant JvmName annotations for Array.copyOf, copyOfRange

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-12 22:57:16 +03:00
parent b99e1111f6
commit 68971e2162
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Arrays.kt
-3
View File
@@ -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. * Returns new array which is a copy of the original array.
*/ */
@kotlin.jvm.JvmVersion @kotlin.jvm.JvmVersion
@JvmName("mutableCopyOf")
public fun <T> Array<T>.copyOf(): Array<T> { public fun <T> Array<T>.copyOf(): Array<T> {
return Arrays.copyOf(this, size) 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. * Returns new array which is a copy of the original array.
*/ */
@kotlin.jvm.JvmVersion @kotlin.jvm.JvmVersion
@JvmName("mutableCopyOf")
public fun <T> Array<T>.copyOf(newSize: Int): Array<T?> { public fun <T> Array<T>.copyOf(newSize: Int): Array<T?> {
return Arrays.copyOf(this, newSize) 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. * Returns new array which is a copy of range of original array.
*/ */
@kotlin.jvm.JvmVersion @kotlin.jvm.JvmVersion
@JvmName("mutableCopyOfRange")
public fun <T> Array<T>.copyOfRange(fromIndex: Int, toIndex: Int): Array<T> { public fun <T> Array<T>.copyOfRange(fromIndex: Int, toIndex: Int): Array<T> {
return Arrays.copyOfRange(this, fromIndex, toIndex) return Arrays.copyOfRange(this, fromIndex, toIndex)
} }
libraries/tools/kotlin-stdlib-gen/src/templates/SpecialJVM.kt
+1 -5
View File
@@ -60,7 +60,6 @@ fun specialJVM(): List<GenericFunction> {
only(InvariantArraysOfObjects, ArraysOfPrimitives) only(InvariantArraysOfObjects, ArraysOfPrimitives)
doc { "Returns new array which is a copy of range of original array." } doc { "Returns new array which is a copy of range of original array." }
returns("SELF") returns("SELF")
annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOfRange")"""}
body { body {
"return Arrays.copyOfRange(this, fromIndex, toIndex)" "return Arrays.copyOfRange(this, fromIndex, toIndex)"
} }
@@ -70,7 +69,6 @@ fun specialJVM(): List<GenericFunction> {
only(InvariantArraysOfObjects, ArraysOfPrimitives) only(InvariantArraysOfObjects, ArraysOfPrimitives)
doc { "Returns new array which is a copy of the original array." } doc { "Returns new array which is a copy of the original array." }
returns("SELF") returns("SELF")
annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOf")"""}
body { body {
"return Arrays.copyOf(this, size)" "return Arrays.copyOf(this, size)"
} }
@@ -81,12 +79,10 @@ fun specialJVM(): List<GenericFunction> {
only(InvariantArraysOfObjects, ArraysOfPrimitives) only(InvariantArraysOfObjects, ArraysOfPrimitives)
doc { "Returns new array which is a copy of the original array." } doc { "Returns new array which is a copy of the original array." }
returns("SELF") returns("SELF")
returns(InvariantArraysOfObjects) { "Array<T?>" }
body { body {
"return Arrays.copyOf(this, newSize)" "return Arrays.copyOf(this, newSize)"
} }
returns(ArraysOfObjects) { "Array<out T?>" }
returns(InvariantArraysOfObjects) { "Array<T?>" }
annotations(InvariantArraysOfObjects) { """@JvmName("mutableCopyOf")"""}
} }
templates add f("fill(element: T, fromIndex: Int = 0, toIndex: Int = size)") { templates add f("fill(element: T, fromIndex: Int = 0, toIndex: Int = size)") {