From 0b88801c66083f70d2d197963ca9ffd239c39290 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Sep 2015 22:31:01 +0300 Subject: [PATCH] Drop deprecated sorting and reversing methods. --- libraries/stdlib/src/generated/_Arrays.kt | 293 ----------------- .../stdlib/src/generated/_Collections.kt | 81 ----- libraries/stdlib/src/generated/_Sequences.kt | 21 -- libraries/stdlib/src/generated/_Strings.kt | 8 - .../src/templates/Ordering.kt | 307 ++++++++---------- 5 files changed, 129 insertions(+), 581 deletions(-) diff --git a/libraries/stdlib/src/generated/_Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt index f2e175b1f03..b89ae9c7a7a 100644 --- a/libraries/stdlib/src/generated/_Arrays.kt +++ b/libraries/stdlib/src/generated/_Arrays.kt @@ -4084,78 +4084,6 @@ public inline fun ShortArray.takeWhile(predicate: (Short) -> Boolean): List Array.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun BooleanArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun ByteArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun CharArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun DoubleArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun FloatArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun IntArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun LongArray.reverse(): List { - return reversed() -} - -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun ShortArray.reverse(): List { - return reversed() -} - /** * Returns a list with elements in reversed order. */ @@ -4354,38 +4282,6 @@ public fun ShortArray.reversedArray(): ShortArray { return result } -/** - * Returns a list of all elements, sorted by the specified [comparator]. - */ -@Deprecated("This method may change its behavior soon. Use sortedWith() instead.", ReplaceWith("sortedWith(comparator)")) -public fun Array.sortBy(comparator: Comparator): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList, comparator) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("This method may change its behavior soon. Use sortedBy() instead.", ReplaceWith("sortedBy(order)")) -public inline fun > Array.sortBy(crossinline order: (T) -> R): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, in descending order by results of specified [order] function. - */ -@Deprecated("This method may change its behavior soon. Use sortedByDescending() instead.", ReplaceWith("sortedByDescending(order)")) -public inline fun > Array.sortDescendingBy(crossinline order: (T) -> R): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareByDescending(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - /** * Returns a list of all elements sorted according to their natural sort order. */ @@ -4865,195 +4761,6 @@ public fun ShortArray.sortedWith(comparator: Comparator): List return sortedList } -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun > Array.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun BooleanArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun ByteArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun CharArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun DoubleArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun FloatArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun IntArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun LongArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun ShortArray.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > Array.toSortedListBy(order: (T) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > BooleanArray.toSortedListBy(order: (Boolean) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > ByteArray.toSortedListBy(order: (Byte) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > CharArray.toSortedListBy(order: (Char) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > DoubleArray.toSortedListBy(order: (Double) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > FloatArray.toSortedListBy(order: (Float) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > IntArray.toSortedListBy(order: (Int) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > LongArray.toSortedListBy(order: (Long) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > ShortArray.toSortedListBy(order: (Short) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - /** * Returns the Iterable that wraps the original array. */ diff --git a/libraries/stdlib/src/generated/_Collections.kt b/libraries/stdlib/src/generated/_Collections.kt index 741b53226bf..1a6f1b7d3f9 100644 --- a/libraries/stdlib/src/generated/_Collections.kt +++ b/libraries/stdlib/src/generated/_Collections.kt @@ -710,14 +710,6 @@ public inline fun Iterable.takeWhile(predicate: (T) -> Boolean): List return list } -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun Iterable.reverse(): List { - return reversed() -} - /** * Returns a list with elements in reversed order. */ @@ -728,58 +720,6 @@ public fun Iterable.reversed(): List { return list } -/** - * Returns a sorted list of all elements. - */ -@Deprecated("This method may change its behavior soon. Use sorted() instead.", ReplaceWith("sorted()")) -public fun > Iterable.sort(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a list of all elements, sorted by the specified [comparator]. - */ -@Deprecated("This method may change its behavior soon. Use sortedWith() instead.", ReplaceWith("sortedWith(comparator)")) -public fun Iterable.sortBy(comparator: Comparator): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList, comparator) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("This method may change its behavior soon. Use sortedBy() instead.", ReplaceWith("sortedBy(order)")) -public inline fun > Iterable.sortBy(crossinline order: (T) -> R): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - -/** - * Returns a sorted list of all elements, in descending order. - */ -@Deprecated("This method may change its behavior soon. Use sortedDescending() instead.", ReplaceWith("sortedDescending()")) -public fun > Iterable.sortDescending(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList, comparator { x, y -> y.compareTo(x) }) - return sortedList -} - -/** - * Returns a sorted list of all elements, in descending order by results of specified [order] function. - */ -@Deprecated("This method may change its behavior soon. Use sortedByDescending() instead.", ReplaceWith("sortedByDescending(order)")) -public inline fun > Iterable.sortDescendingBy(crossinline order: (T) -> R): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareByDescending(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - /** * Returns a list of all elements sorted according to their natural sort order. */ @@ -819,27 +759,6 @@ public fun Iterable.sortedWith(comparator: Comparator): List { return sortedList } -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use sorted() instead.", ReplaceWith("sorted()")) -public fun > Iterable.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use sortedBy(order) instead.", ReplaceWith("sortedBy(order)")) -public fun > Iterable.toSortedListBy(order: (T) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - /** * Returns an array of Boolean containing all of the elements of this collection. */ diff --git a/libraries/stdlib/src/generated/_Sequences.kt b/libraries/stdlib/src/generated/_Sequences.kt index 23f1a495191..732947f7aa5 100644 --- a/libraries/stdlib/src/generated/_Sequences.kt +++ b/libraries/stdlib/src/generated/_Sequences.kt @@ -403,27 +403,6 @@ public fun Sequence.sortedWith(comparator: Comparator): Sequence } } -/** - * Returns a sorted list of all elements. - */ -@Deprecated("Use asIterable().sorted() instead.", ReplaceWith("asIterable().sorted()")) -public fun > Sequence.toSortedList(): List { - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList -} - -/** - * Returns a sorted list of all elements, ordered by results of specified [order] function. - */ -@Deprecated("Use asIterable().sortedBy(order) instead.", ReplaceWith("asIterable().sortedBy(order)")) -public fun > Sequence.toSortedListBy(order: (T) -> V): List { - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList -} - /** * Returns an [ArrayList] of all elements. */ diff --git a/libraries/stdlib/src/generated/_Strings.kt b/libraries/stdlib/src/generated/_Strings.kt index 6d11816d6fc..d9778043d63 100644 --- a/libraries/stdlib/src/generated/_Strings.kt +++ b/libraries/stdlib/src/generated/_Strings.kt @@ -341,14 +341,6 @@ public inline fun String.takeWhile(predicate: (Char) -> Boolean): String { return this } -/** - * Returns a list with elements in reversed order. - */ -@Deprecated("reverse will change its behavior soon. Use reversed() instead.", ReplaceWith("reversed()")) -public fun String.reverse(): String { - return reversed() -} - /** * Returns a string with characters in reversed order. */ diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt index 3042f4db207..9ef3c0da830 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt @@ -5,18 +5,18 @@ import templates.Family.* fun ordering(): List { val templates = arrayListOf() - templates add f("reverse()") { - deprecate("reverse will change its behavior soon. Use reversed() instead.") - deprecateReplacement("reversed()") - doc { "Returns a list with elements in reversed order." } - returns { "List" } - body { """return reversed()""" } - - include(Strings) - returns(Strings) { "SELF" } - - exclude(Sequences) - } +// templates add f("reverse()") { +// deprecate("reverse will change its behavior soon. Use reversed() instead.") +// deprecateReplacement("reversed()") +// doc { "Returns a list with elements in reversed order." } +// returns { "List" } +// body { """return reversed()""" } +// +// include(Strings) +// returns(Strings) { "SELF" } +// +// exclude(Sequences) +// } templates add f("reversed()") { doc { "Returns a list with elements in reversed order." } @@ -278,177 +278,128 @@ fun ordering(): List { } } - templates add f("sort()") { - doc { - """ - Returns a sorted list of all elements. - """ - } - returns("List") - typeParam("T : Comparable") - deprecate("This method may change its behavior soon. Use sorted() instead.") - deprecateReplacement("sorted()") - body { - """ - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList - """ - } +// templates add f("sort()") { +// doc { +// """ +// Returns a sorted list of all elements. +// """ +// } +// returns("List") +// typeParam("T : Comparable") +// deprecate("This method may change its behavior soon. Use sorted() instead.") +// deprecateReplacement("sorted()") +// body { +// """ +// val sortedList = toArrayList() +// java.util.Collections.sort(sortedList) +// return sortedList +// """ +// } +// +// exclude(Sequences) +// exclude(ArraysOfPrimitives) +// exclude(ArraysOfObjects) +// exclude(Strings) +// } - exclude(Sequences) - exclude(ArraysOfPrimitives) - exclude(ArraysOfObjects) - exclude(Strings) - } +// templates add f("sortDescending()") { +// doc { +// """ +// Returns a sorted list of all elements, in descending order. +// """ +// } +// deprecate("This method may change its behavior soon. Use sortedDescending() instead.") +// deprecateReplacement("sortedDescending()") +// returns("List") +// typeParam("T : Comparable") +// body { +// """ +// val sortedList = toArrayList() +// java.util.Collections.sort(sortedList, comparator { x, y -> y.compareTo(x) }) +// return sortedList +// """ +// } +// +// exclude(Sequences) +// exclude(ArraysOfPrimitives) +// exclude(ArraysOfObjects) +// exclude(Strings) +// } - templates add f("toSortedList()") { - doc { - """ - Returns a sorted list of all elements. - """ - } - returns("List") - typeParam("T : Comparable") - deprecate("Use sorted() instead.") - deprecateReplacement("sorted()") +// templates add f("sortBy(crossinline order: (T) -> R)") { +// inline(true) +// +// doc { +// """ +// Returns a sorted list of all elements, ordered by results of specified [order] function. +// """ +// } +// deprecate("This method may change its behavior soon. Use sortedBy() instead.") +// deprecateReplacement("sortedBy(order)") +// returns("List") +// typeParam("R : Comparable") +// body { +// """ +// val sortedList = toArrayList() +// val sortBy: Comparator = compareBy(order) +// java.util.Collections.sort(sortedList, sortBy) +// return sortedList +// """ +// } +// +// exclude(Sequences) +// exclude(ArraysOfPrimitives) +// exclude(Strings) +// } - deprecate("Use asIterable().sorted() instead.", Sequences) - deprecateReplacement("asIterable().sorted()", Sequences) - body { - """ - val sortedList = toArrayList() - java.util.Collections.sort(sortedList) - return sortedList - """ - } - only(Sequences, ArraysOfObjects, ArraysOfPrimitives, Iterables) - } +// templates add f("sortDescendingBy(crossinline order: (T) -> R)") { +// inline(true) +// +// doc { +// """ +// Returns a sorted list of all elements, in descending order by results of specified [order] function. +// """ +// } +// deprecate("This method may change its behavior soon. Use sortedByDescending() instead.") +// deprecateReplacement("sortedByDescending(order)") +// returns("List") +// typeParam("R : Comparable") +// body { +// """ +// val sortedList = toArrayList() +// val sortBy: Comparator = compareByDescending(order) +// java.util.Collections.sort(sortedList, sortBy) +// return sortedList +// """ +// } +// +// exclude(Sequences) +// exclude(ArraysOfPrimitives) +// exclude(Strings) +// } - templates add f("sortDescending()") { - doc { - """ - Returns a sorted list of all elements, in descending order. - """ - } - deprecate("This method may change its behavior soon. Use sortedDescending() instead.") - deprecateReplacement("sortedDescending()") - returns("List") - typeParam("T : Comparable") - body { - """ - val sortedList = toArrayList() - java.util.Collections.sort(sortedList, comparator { x, y -> y.compareTo(x) }) - return sortedList - """ - } - - exclude(Sequences) - exclude(ArraysOfPrimitives) - exclude(ArraysOfObjects) - exclude(Strings) - } - - templates add f("sortBy(crossinline order: (T) -> R)") { - inline(true) - - doc { - """ - Returns a sorted list of all elements, ordered by results of specified [order] function. - """ - } - deprecate("This method may change its behavior soon. Use sortedBy() instead.") - deprecateReplacement("sortedBy(order)") - returns("List") - typeParam("R : Comparable") - body { - """ - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList - """ - } - - exclude(Sequences) - exclude(ArraysOfPrimitives) - exclude(Strings) - } - - templates add f("toSortedListBy(order: (T) -> V)") { - doc { - """ - Returns a sorted list of all elements, ordered by results of specified [order] function. - """ - } - returns("List") - deprecate("Use sortedBy(order) instead.") - deprecateReplacement("sortedBy(order)") - - deprecate("Use asIterable().sortedBy(order) instead.", Sequences) - deprecateReplacement("asIterable().sortedBy(order)", Sequences) - typeParam("T") - typeParam("V : Comparable") - body { - """ - val sortedList = toArrayList() - val sortBy: Comparator = compareBy(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList - """ - } - - only(Sequences, ArraysOfObjects, ArraysOfPrimitives, Iterables) - } - - templates add f("sortDescendingBy(crossinline order: (T) -> R)") { - inline(true) - - doc { - """ - Returns a sorted list of all elements, in descending order by results of specified [order] function. - """ - } - deprecate("This method may change its behavior soon. Use sortedByDescending() instead.") - deprecateReplacement("sortedByDescending(order)") - returns("List") - typeParam("R : Comparable") - body { - """ - val sortedList = toArrayList() - val sortBy: Comparator = compareByDescending(order) - java.util.Collections.sort(sortedList, sortBy) - return sortedList - """ - } - - exclude(Sequences) - exclude(ArraysOfPrimitives) - exclude(Strings) - } - - templates add f("sortBy(comparator: Comparator)") { - doc { - """ - Returns a list of all elements, sorted by the specified [comparator]. - """ - } - returns("List") - deprecate("This method may change its behavior soon. Use sortedWith() instead.") - deprecateReplacement("sortedWith(comparator)") - body { - """ - val sortedList = toArrayList() - java.util.Collections.sort(sortedList, comparator) - return sortedList - """ - } - - exclude(Sequences) - exclude(ArraysOfPrimitives) - exclude(Strings) - } +// templates add f("sortBy(comparator: Comparator)") { +// doc { +// """ +// Returns a list of all elements, sorted by the specified [comparator]. +// """ +// } +// returns("List") +// deprecate("This method may change its behavior soon. Use sortedWith() instead.") +// deprecateReplacement("sortedWith(comparator)") +// body { +// """ +// val sortedList = toArrayList() +// java.util.Collections.sort(sortedList, comparator) +// return sortedList +// """ +// } +// +// exclude(Sequences) +// exclude(ArraysOfPrimitives) +// exclude(Strings) +// } return templates } \ No newline at end of file