From 3bedbfae33a789022f4235f68701a80e4d65d3ef Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 14 Dec 2016 17:55:34 +0300
Subject: [PATCH] Move kotlin.comparisons.Comparator to kotlin package and
 remove the former from default imports.

---
 .../src/org/jetbrains/kotlin/resolve/TargetPlatform.kt       | 1 -
 core/runtime.jvm/src/kotlin/TypeAliases.kt                   | 3 +++
 js/js.libraries/src/core/Comparator.kt                       | 2 +-
 libraries/stdlib/src/kotlin/comparisons/TypeAliases.kt       | 5 -----
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 libraries/stdlib/src/kotlin/comparisons/TypeAliases.kt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt
index 80bd939d202..51ba717678f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt
@@ -47,7 +47,6 @@ abstract class TargetPlatform(val platformName: String) {
             add(ImportPath("kotlin.ranges.*"))
             add(ImportPath("kotlin.sequences.*"))
             add(ImportPath("kotlin.text.*"))
-            add(ImportPath("kotlin.comparisons.Comparator"))
         }
 
         override val platformConfigurator =
diff --git a/core/runtime.jvm/src/kotlin/TypeAliases.kt b/core/runtime.jvm/src/kotlin/TypeAliases.kt
index 9a152f40635..db5d612db02 100644
--- a/core/runtime.jvm/src/kotlin/TypeAliases.kt
+++ b/core/runtime.jvm/src/kotlin/TypeAliases.kt
@@ -31,3 +31,6 @@ package kotlin
 @SinceKotlin("1.1") public typealias AssertionError = java.lang.AssertionError
 
 @SinceKotlin("1.1") public typealias NoSuchElementException = java.util.NoSuchElementException
+
+
+@SinceKotlin("1.1") public typealias Comparator<T> = java.util.Comparator<T>
diff --git a/js/js.libraries/src/core/Comparator.kt b/js/js.libraries/src/core/Comparator.kt
index c7573b9499d..af19c1a26ab 100644
--- a/js/js.libraries/src/core/Comparator.kt
+++ b/js/js.libraries/src/core/Comparator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlin.comparisons
+package kotlin
 
 
 public interface Comparator<T> {
diff --git a/libraries/stdlib/src/kotlin/comparisons/TypeAliases.kt b/libraries/stdlib/src/kotlin/comparisons/TypeAliases.kt
deleted file mode 100644
index 6de84b9087d..00000000000
--- a/libraries/stdlib/src/kotlin/comparisons/TypeAliases.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-@file:kotlin.jvm.JvmVersion
-
-package kotlin.comparisons
-
-public typealias Comparator<T> = java.util.Comparator<T>