From 868bf90de226bf8e4828bbfb7c24a462f5cf1007 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 31 May 2013 11:35:11 +0400 Subject: [PATCH] Rollback 0514ddc719d50ae79f64749fe4d6e3bc86d02f60 due to failing tests --- libraries/stdlib/src/kotlin/IterablesSpecial.kt | 10 ---------- libraries/stdlib/src/kotlin/JUtil.kt | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libraries/stdlib/src/kotlin/IterablesSpecial.kt b/libraries/stdlib/src/kotlin/IterablesSpecial.kt index 92abbab4362..62aff9516be 100644 --- a/libraries/stdlib/src/kotlin/IterablesSpecial.kt +++ b/libraries/stdlib/src/kotlin/IterablesSpecial.kt @@ -75,13 +75,3 @@ public inline fun Iterable.sort(comparator: java.util.Comparator) : Li java.util.Collections.sort(list, comparator) return list } - -public inline fun Iterable.sort(compare: (T, T) -> Int): List { - return sort( - object : java.util.Comparator { - public override fun compare(o1: T, o2: T): Int { - return compare.invoke(o1, o2) - } - } - ) -} \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/JUtil.kt b/libraries/stdlib/src/kotlin/JUtil.kt index 400fb43963c..fc015040ae4 100644 --- a/libraries/stdlib/src/kotlin/JUtil.kt +++ b/libraries/stdlib/src/kotlin/JUtil.kt @@ -27,7 +27,7 @@ public inline fun Collection?.orEmpty() : Collection /** TODO these functions don't work when they generate the Array versions when they are in JLIterables */ public inline fun > Iterable.toSortedList() : List = toCollection(ArrayList()).sort() -public inline fun Iterable.toSortedList(compare: (T, T) -> Int) : List = toList().sort(compare) +public inline fun > Iterable.toSortedList(comparator: java.util.Comparator) : List = toList().sort(comparator) // List APIs