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

Deprecate 'comparator { ... }' in favor of Comparator SAM-constructor. Provide SAM-like constructor for JS.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-17 17:26:38 +03:00
parent 67ef790abc
commit 5bbce7a1de
5 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/util/Ordering.kt
-9
View File
@@ -182,15 +182,6 @@ inline public fun <T, K> Comparator<T>.thenByDescending(comparator: Comparator<i
}
/**
* Creates a comparator using the function to calculate a result of comparison.
*/
inline public fun <T> comparator(crossinline comparison: (T, T) -> Int): Comparator<T> {
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int = comparison(a, b)
}
}
/**
* Creates a comparator using the primary comparator and function to calculate a result of comparison.
*/
libraries/stdlib/src/kotlin/util/OrderingDeprecated.kt
+2 -7
View File
@@ -194,16 +194,11 @@ inline public fun <T, K> Comparator<T>.thenByDescending(comparator: Comparator<i
}
}
/**
* Creates a comparator using the function to calculate a result of comparison.
*/
@Deprecated("Use comparator function from kotlin.comparisons package.", ReplaceWith("comparator(comparison)", "kotlin.comparisons.comparator"))
inline public fun <T> comparator(crossinline comparison: (T, T) -> Int): Comparator<T> {
return object : Comparator<T> {
public override fun compare(a: T, b: T): Int = comparison(a, b)
}
}
@Deprecated("Use Comparator SAM-constructor instead.", ReplaceWith("Comparator(comparison)", "java.util.Comparator"))
inline public fun <T> comparator(crossinline comparison: (T, T) -> Int) = Comparator<T> { a, b -> comparison(a, b) }
/**
* Creates a comparator using the primary comparator and function to calculate a result of comparison.