From 361e94fd1a7ec567d504733efa553b1f9db2aeb2 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@jetbrains.com>
Date: Mon, 6 Mar 2017 15:22:25 +0300
Subject: [PATCH] Simplify default imports.

---
 .../jetbrains/kotlin/backend/konan/KonanPlatform.kt  | 12 +++++-------
 runtime/src/main/kotlin/kotlin/Comparable.kt         |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt
index 2b3fb5b9917..86165849981 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanPlatform.kt
@@ -63,13 +63,11 @@ class KonanBuiltIns(storageManager: StorageManager) : KotlinBuiltIns(storageMana
 
 object KonanPlatform : TargetPlatform("Konan") {
     override val multiTargetPlatform = MultiTargetPlatform.Specific(platformName)
-    override fun getDefaultImports(languageVersionSettings: LanguageVersionSettings): List<ImportPath> =
-            Default.getDefaultImports(languageVersionSettings) + listOf(
-                    ImportPath("kotlin.*"),
-                    ImportPath("kotlin.collections.*"),
-                    ImportPath("kotlin.io.*"),
-                    ImportPath("konan.*")
-            )
+    override fun getDefaultImports(languageVersionSettings: LanguageVersionSettings): List<ImportPath> {
+       return Default.getDefaultImports(languageVersionSettings) + listOf(
+                ImportPath("konan.*")
+        )
+    }
 
     override val platformConfigurator: PlatformConfigurator = KonanPlatformConfigurator
 
diff --git a/runtime/src/main/kotlin/kotlin/Comparable.kt b/runtime/src/main/kotlin/kotlin/Comparable.kt
index 9ef2491dc2b..0199dda2ad0 100644
--- a/runtime/src/main/kotlin/kotlin/Comparable.kt
+++ b/runtime/src/main/kotlin/kotlin/Comparable.kt
@@ -14,5 +14,3 @@ public interface Comparable<in T> {
     public operator fun compareTo(other: T): Int
 }
 
-typealias Comparator<T> = kotlin.comparisons.Comparator<T>
-