From 336226ac9eef767e0de78dc60641a2914fa9120d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 25 Apr 2016 12:56:07 +0200
Subject: [PATCH] minor: Switch to simpler descending sort, reduce dependency

---
 .../jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt   | 4 ++--
 .../src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt    | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
index 7b0bc31ddeb..2dc6a114e33 100644
--- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
@@ -28,7 +28,7 @@ import java.io.PrintStream
 import java.rmi.server.UnicastRemoteObject
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
-import kotlin.comparisons.*
+import kotlin.comparisons.compareByDescending
 import kotlin.concurrent.thread
 
 
@@ -259,7 +259,7 @@ object KotlinCompilerClient {
         val aliveWithOpts = walkDaemons(registryDir, compilerId, report = report)
                 .map { Pair(it, it.getDaemonJVMOptions()) }
                 .filter { it.second.isGood }
-                .sortedWith(compareBy(DaemonJVMOptionsMemoryComparator().reversed(), { it.second.get() }))
+                .sortedWith(compareByDescending(DaemonJVMOptionsMemoryComparator(), { it.second.get() }))
         val optsCopy = daemonJVMOptions.copy()
         // if required options fit into fattest running daemon - return the daemon and required options with memory params set to actual ones in the daemon
         return aliveWithOpts.firstOrNull()?.check { daemonJVMOptions memorywiseFitsInto it.second.get() }?.let {
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 50917e01054..9092fdc1a19 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -40,8 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import java.util.logging.Level
 import java.util.logging.Logger
-import kotlin.comparisons.compareBy
-import kotlin.comparisons.reversed
+import kotlin.comparisons.compareByDescending
 import kotlin.concurrent.read
 import kotlin.concurrent.schedule
 import kotlin.concurrent.write
@@ -342,7 +341,7 @@ class CompileServiceImpl(
             val aliveWithOpts = walkDaemons(File(daemonOptions.runFilesPathOrDefault), compilerId, filter = { f, p -> p != port }, report = { lvl, msg -> log.info(msg) })
                     .map { Pair(it, it.getDaemonJVMOptions()) }
                     .filter { it.second.isGood }
-                    .sortedWith(compareBy(DaemonJVMOptionsMemoryComparator().reversed(), { it.second.get() }))
+                    .sortedWith(compareByDescending(DaemonJVMOptionsMemoryComparator(), { it.second.get() }))
             if (aliveWithOpts.any()) {
                 val fattestOpts = aliveWithOpts.first().second.get()
                 // second part of the condition means that we prefer other daemon if is "equal" to the current one