From 84d3d42e05e44884b5522a406fe4fa6bba0b55a4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 26 Aug 2015 19:59:25 +0300 Subject: [PATCH] Replace deprecated `reverse` method usages. --- libraries/stdlib/src/generated/_Ordering.kt | 14 +++++++------- .../stdlib/test/collections/CollectionTest.kt | 2 +- libraries/stdlib/test/collections/SequenceTest.kt | 2 +- .../kotlin-stdlib-gen/src/templates/Ordering.kt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/stdlib/src/generated/_Ordering.kt b/libraries/stdlib/src/generated/_Ordering.kt index 57187317b1c..1fc60c751b6 100644 --- a/libraries/stdlib/src/generated/_Ordering.kt +++ b/libraries/stdlib/src/generated/_Ordering.kt @@ -548,49 +548,49 @@ public fun > Array.sortedDescending(): List { * Returns a list of all elements sorted descending according to their natural sort order. */ public fun ByteArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun CharArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun DoubleArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun FloatArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun IntArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun LongArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** * Returns a list of all elements sorted descending according to their natural sort order. */ public fun ShortArray.sortedDescending(): List { - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() } /** diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index c968a6f15c7..ceb73475438 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -589,7 +589,7 @@ class CollectionTest { } test fun sortedWith() { - val comparator = compareBy { it.toUpperCase().reverse() } + val comparator = compareBy { it.toUpperCase().reversed() } val data = listOf("cat", "dad", "BAD") expect(listOf("BAD", "dad", "cat")) { data.sortedWith(comparator) } diff --git a/libraries/stdlib/test/collections/SequenceTest.kt b/libraries/stdlib/test/collections/SequenceTest.kt index 2b5f61aad7f..df11de69760 100644 --- a/libraries/stdlib/test/collections/SequenceTest.kt +++ b/libraries/stdlib/test/collections/SequenceTest.kt @@ -333,7 +333,7 @@ public class SequenceTest { } test fun sortedWith() { - val comparator = compareBy { s: String -> s.reverse() } + val comparator = compareBy { s: String -> s.reversed() } assertEquals(listOf("act", "wast", "test"), sequenceOf("act", "test", "wast").sortedWith(comparator).toList()) } diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt index 16cb715517e..ca15fe1db1d 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Ordering.kt @@ -105,7 +105,7 @@ fun ordering(): List { } body(ArraysOfPrimitives) { """ - return copyOf().apply { sort() }.reverse() + return copyOf().apply { sort() }.reversed() """ }