From 55c8b35eee2ee8a93ccaffeaac6f9c3e4fd4ff18 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 28 Sep 2018 14:57:14 +0200 Subject: [PATCH] Remove unneeded default imports in stdlib and tests --- libraries/stdlib/common/src/generated/_Arrays.kt | 3 --- libraries/stdlib/common/src/generated/_Collections.kt | 3 --- libraries/stdlib/common/src/generated/_Comparisons.kt | 3 --- libraries/stdlib/common/src/generated/_Maps.kt | 3 --- libraries/stdlib/common/src/generated/_Ranges.kt | 3 --- libraries/stdlib/common/src/generated/_Sequences.kt | 3 --- libraries/stdlib/common/src/generated/_Sets.kt | 3 --- libraries/stdlib/common/src/generated/_Strings.kt | 3 --- libraries/stdlib/common/src/generated/_UArrays.kt | 3 --- libraries/stdlib/common/src/generated/_URanges.kt | 3 --- .../kotlin/coroutines/experimental/SafeContinuationJvm.kt | 2 +- .../src/kotlin/coroutines/experimental/SequenceBuilder.kt | 1 - .../jvm/src/kotlin/coroutines/SafeContinuationJvm.kt | 1 - .../coroutines/src/kotlin/sequences/SequenceBuilder.kt | 1 - libraries/stdlib/js/irRuntime/hacks.kt | 2 -- libraries/stdlib/js/irRuntime/noPackageHacks.kt | 5 +---- libraries/stdlib/js/src/generated/_ArraysJs.kt | 3 --- libraries/stdlib/js/src/generated/_CollectionsJs.kt | 3 --- libraries/stdlib/js/src/generated/_ComparisonsJs.kt | 3 --- libraries/stdlib/js/src/kotlin/dom/Dom.kt | 4 +--- libraries/stdlib/jvm/src/generated/_ArraysJvm.kt | 3 --- libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt | 3 --- libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt | 3 --- libraries/stdlib/jvm/src/generated/_SequencesJvm.kt | 3 --- libraries/stdlib/jvm/src/generated/_StringsJvm.kt | 3 --- .../stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt | 1 - .../stdlib/jvm/src/kotlin/collections/SequencesJVM.kt | 2 -- .../jvm/src/kotlin/internal/PlatformImplementations.kt | 3 +-- libraries/stdlib/jvm/src/kotlin/io/Console.kt | 3 +-- libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt | 1 - .../stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt | 1 - libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt | 1 - libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt | 7 ++----- .../stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt | 2 -- libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt | 2 -- libraries/stdlib/jvm/src/kotlin/system/Process.kt | 4 +--- libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt | 4 +--- libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt | 2 -- libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt | 6 ++---- .../jvm/src/kotlin/text/StringNumberConversionsJVM.kt | 3 --- libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt | 2 -- libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt | 6 ++---- libraries/stdlib/jvm/test/collections/MapJVMTest.kt | 1 - libraries/stdlib/jvm/test/utils/LazyJVMTest.kt | 2 -- libraries/stdlib/src/kotlin/collections/AbstractList.kt | 2 -- libraries/stdlib/src/kotlin/collections/Collections.kt | 2 -- libraries/stdlib/src/kotlin/collections/ReversedViews.kt | 4 +--- libraries/stdlib/src/kotlin/collections/Sequences.kt | 2 -- libraries/stdlib/src/kotlin/collections/SlidingWindow.kt | 4 +--- libraries/stdlib/src/kotlin/properties/Delegates.kt | 1 - libraries/stdlib/src/kotlin/random/Random.kt | 1 - libraries/stdlib/src/kotlin/ranges/Ranges.kt | 2 -- .../stdlib/src/kotlin/text/StringNumberConversions.kt | 6 +----- libraries/stdlib/src/kotlin/text/Strings.kt | 4 ---- libraries/stdlib/test/OrderingTest.kt | 1 - libraries/stdlib/test/collections/ArraysTest.kt | 4 ++-- libraries/stdlib/test/collections/CollectionTest.kt | 1 - libraries/stdlib/test/collections/ListBinarySearchTest.kt | 1 - libraries/stdlib/test/collections/SequenceTest.kt | 3 +-- libraries/stdlib/test/js/JsCollectionsTest.kt | 1 - libraries/stdlib/test/numbers/NaNPropagationTest.kt | 3 +-- libraries/stdlib/test/ranges/ProgressionLastElementTest.kt | 2 -- libraries/stdlib/test/text/RegexTest.kt | 5 ++--- libraries/stdlib/test/utils/LazyTest.kt | 3 +-- libraries/stdlib/test/utils/TODOTest.kt | 1 - .../src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt | 3 +-- .../tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt | 3 --- 67 files changed, 24 insertions(+), 158 deletions(-) diff --git a/libraries/stdlib/common/src/generated/_Arrays.kt b/libraries/stdlib/common/src/generated/_Arrays.kt index 4dc1211e0de..549a2b7f392 100644 --- a/libraries/stdlib/common/src/generated/_Arrays.kt +++ b/libraries/stdlib/common/src/generated/_Arrays.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Collections.kt b/libraries/stdlib/common/src/generated/_Collections.kt index 45e8276c1a8..a52f17295f1 100644 --- a/libraries/stdlib/common/src/generated/_Collections.kt +++ b/libraries/stdlib/common/src/generated/_Collections.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Comparisons.kt b/libraries/stdlib/common/src/generated/_Comparisons.kt index 6ba7aa83967..a6b83dd4d0b 100644 --- a/libraries/stdlib/common/src/generated/_Comparisons.kt +++ b/libraries/stdlib/common/src/generated/_Comparisons.kt @@ -13,9 +13,6 @@ package kotlin.comparisons // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Maps.kt b/libraries/stdlib/common/src/generated/_Maps.kt index 849fc60f607..7bde51dd3dd 100644 --- a/libraries/stdlib/common/src/generated/_Maps.kt +++ b/libraries/stdlib/common/src/generated/_Maps.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Ranges.kt b/libraries/stdlib/common/src/generated/_Ranges.kt index 7af596ba3d5..792b7a2b191 100644 --- a/libraries/stdlib/common/src/generated/_Ranges.kt +++ b/libraries/stdlib/common/src/generated/_Ranges.kt @@ -13,9 +13,6 @@ package kotlin.ranges // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Sequences.kt b/libraries/stdlib/common/src/generated/_Sequences.kt index 1b9c2137d2e..5f5af922785 100644 --- a/libraries/stdlib/common/src/generated/_Sequences.kt +++ b/libraries/stdlib/common/src/generated/_Sequences.kt @@ -13,9 +13,6 @@ package kotlin.sequences // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Sets.kt b/libraries/stdlib/common/src/generated/_Sets.kt index 93ab64994b9..5d22edf5501 100644 --- a/libraries/stdlib/common/src/generated/_Sets.kt +++ b/libraries/stdlib/common/src/generated/_Sets.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_Strings.kt b/libraries/stdlib/common/src/generated/_Strings.kt index f8408db8420..0225f655197 100644 --- a/libraries/stdlib/common/src/generated/_Strings.kt +++ b/libraries/stdlib/common/src/generated/_Strings.kt @@ -13,9 +13,6 @@ package kotlin.text // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_UArrays.kt b/libraries/stdlib/common/src/generated/_UArrays.kt index d601b7cfc50..52619bbf66f 100644 --- a/libraries/stdlib/common/src/generated/_UArrays.kt +++ b/libraries/stdlib/common/src/generated/_UArrays.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/common/src/generated/_URanges.kt b/libraries/stdlib/common/src/generated/_URanges.kt index 1ea59ae0679..839056a9f01 100644 --- a/libraries/stdlib/common/src/generated/_URanges.kt +++ b/libraries/stdlib/common/src/generated/_URanges.kt @@ -13,9 +13,6 @@ package kotlin.ranges // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* import kotlin.random.* /** diff --git a/libraries/stdlib/coroutines-experimental/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt b/libraries/stdlib/coroutines-experimental/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt index c1d0c7f458a..655b1ba62a2 100644 --- a/libraries/stdlib/coroutines-experimental/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt +++ b/libraries/stdlib/coroutines-experimental/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt @@ -2,10 +2,10 @@ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ + package kotlin.coroutines.experimental import java.util.concurrent.atomic.AtomicReferenceFieldUpdater -import kotlin.* import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED @PublishedApi diff --git a/libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt b/libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt index e672c893b0f..87570b95a26 100644 --- a/libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt +++ b/libraries/stdlib/coroutines-experimental/src/kotlin/coroutines/experimental/SequenceBuilder.kt @@ -9,7 +9,6 @@ package kotlin.coroutines.experimental -import kotlin.* import kotlin.coroutines.experimental.intrinsics.* import kotlin.experimental.ExperimentalTypeInference diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt index d51151f151a..2f93f0d86c5 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt @@ -5,7 +5,6 @@ package kotlin.coroutines import java.util.concurrent.atomic.AtomicReferenceFieldUpdater -import kotlin.* import kotlin.coroutines.intrinsics.CoroutineSingletons.* import kotlin.coroutines.intrinsics.COROUTINE_SUSPENDED import kotlin.coroutines.jvm.internal.CoroutineStackFrame diff --git a/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt b/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt index 2512ac9e3a6..b28be61f60d 100644 --- a/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt +++ b/libraries/stdlib/coroutines/src/kotlin/sequences/SequenceBuilder.kt @@ -9,7 +9,6 @@ package kotlin.sequences -import kotlin.* import kotlin.coroutines.* import kotlin.coroutines.intrinsics.* import kotlin.experimental.ExperimentalTypeInference diff --git a/libraries/stdlib/js/irRuntime/hacks.kt b/libraries/stdlib/js/irRuntime/hacks.kt index 2233ddced09..a3865d504d2 100644 --- a/libraries/stdlib/js/irRuntime/hacks.kt +++ b/libraries/stdlib/js/irRuntime/hacks.kt @@ -5,8 +5,6 @@ package kotlin -import kotlin.js.* - // TODO: Ignore FunctionN interfaces public interface Function0 : Function { diff --git a/libraries/stdlib/js/irRuntime/noPackageHacks.kt b/libraries/stdlib/js/irRuntime/noPackageHacks.kt index 6250b967c9b..0c422a023c9 100644 --- a/libraries/stdlib/js/irRuntime/noPackageHacks.kt +++ b/libraries/stdlib/js/irRuntime/noPackageHacks.kt @@ -3,9 +3,6 @@ * that can be found in the license/LICENSE.txt file. */ - -import kotlin.js.* - /** Concat regular Array's and TypedArray's into an Array. */ @PublishedApi @@ -51,4 +48,4 @@ internal fun primitiveArrayConcat(vararg args: T): T { internal inline fun withType(type: String, array: dynamic): dynamic { array.`$type$` = type return array -} \ No newline at end of file +} diff --git a/libraries/stdlib/js/src/generated/_ArraysJs.kt b/libraries/stdlib/js/src/generated/_ArraysJs.kt index 5b36ca58b21..af0c279c463 100644 --- a/libraries/stdlib/js/src/generated/_ArraysJs.kt +++ b/libraries/stdlib/js/src/generated/_ArraysJs.kt @@ -13,9 +13,6 @@ package kotlin.collections import kotlin.js.* import primitiveArrayConcat import withType -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns a [List] that wraps the original array. diff --git a/libraries/stdlib/js/src/generated/_CollectionsJs.kt b/libraries/stdlib/js/src/generated/_CollectionsJs.kt index fae48556cfb..b6aaf2b983f 100644 --- a/libraries/stdlib/js/src/generated/_CollectionsJs.kt +++ b/libraries/stdlib/js/src/generated/_CollectionsJs.kt @@ -11,9 +11,6 @@ package kotlin.collections // import kotlin.js.* -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Reverses elements in the list in-place. diff --git a/libraries/stdlib/js/src/generated/_ComparisonsJs.kt b/libraries/stdlib/js/src/generated/_ComparisonsJs.kt index a974b8bcfb5..4536883bd48 100644 --- a/libraries/stdlib/js/src/generated/_ComparisonsJs.kt +++ b/libraries/stdlib/js/src/generated/_ComparisonsJs.kt @@ -11,9 +11,6 @@ package kotlin.comparisons // import kotlin.js.* -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns the greater of two values. diff --git a/libraries/stdlib/js/src/kotlin/dom/Dom.kt b/libraries/stdlib/js/src/kotlin/dom/Dom.kt index c90a5be35de..dbef80bd412 100644 --- a/libraries/stdlib/js/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/js/src/kotlin/dom/Dom.kt @@ -2,11 +2,10 @@ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ + package kotlin.dom import org.w3c.dom.* -import kotlin.collections.* - /** * Gets a value indicating whether this node is a TEXT_NODE or a CDATA_SECTION_NODE. @@ -14,7 +13,6 @@ import kotlin.collections.* public val Node.isText: Boolean get() = nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE - /** * Gets a value indicating whether this node is an [Element]. */ diff --git a/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt b/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt index 520c76d0b84..1bb4ee828f2 100644 --- a/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt +++ b/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns a list containing all elements that are instances of specified class. diff --git a/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt b/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt index 13a746fe6b8..278d9d4f8bb 100644 --- a/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt +++ b/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt @@ -13,9 +13,6 @@ package kotlin.collections // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns a list containing all elements that are instances of specified class. diff --git a/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt b/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt index 7d0159442c6..fc8888e6ba5 100644 --- a/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt +++ b/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt @@ -13,9 +13,6 @@ package kotlin.comparisons // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns the greater of two values. diff --git a/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt b/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt index a77162d273c..e313cd09689 100644 --- a/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt +++ b/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt @@ -13,9 +13,6 @@ package kotlin.sequences // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns a sequence containing all elements that are instances of specified class. diff --git a/libraries/stdlib/jvm/src/generated/_StringsJvm.kt b/libraries/stdlib/jvm/src/generated/_StringsJvm.kt index 6d441fcde2f..0a81fcf3346 100644 --- a/libraries/stdlib/jvm/src/generated/_StringsJvm.kt +++ b/libraries/stdlib/jvm/src/generated/_StringsJvm.kt @@ -13,9 +13,6 @@ package kotlin.text // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* /** * Returns a [SortedSet][java.util.SortedSet] of all characters. diff --git a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt index 961f31e05ea..1a7b6b2fda8 100644 --- a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt @@ -8,7 +8,6 @@ package kotlin.collections -import kotlin.* import kotlin.internal.InlineOnly import kotlin.internal.apiVersionIsAtLeast diff --git a/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt index 0725869c4fc..c18415953f6 100644 --- a/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt @@ -8,8 +8,6 @@ package kotlin.sequences -import kotlin.* - /** * Creates a sequence that returns all values from this enumeration. The sequence is constrained to be iterated only once. * @sample samples.collections.Sequences.Building.sequenceFromEnumeration diff --git a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt index 75b2274a66b..fbfb5a16658 100644 --- a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt +++ b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt @@ -5,7 +5,6 @@ package kotlin.internal -import kotlin.* import java.util.regex.MatchResult import kotlin.random.FallbackThreadLocalRandom import kotlin.random.Random @@ -89,4 +88,4 @@ private fun getJavaVersion(): Int { @PublishedApi @SinceKotlin("1.2") internal fun apiVersionIsAtLeast(major: Int, minor: Int, patch: Int) = - KotlinVersion.CURRENT.isAtLeast(major, minor, patch) \ No newline at end of file + KotlinVersion.CURRENT.isAtLeast(major, minor, patch) diff --git a/libraries/stdlib/jvm/src/kotlin/io/Console.kt b/libraries/stdlib/jvm/src/kotlin/io/Console.kt index 09f0d58dbe6..49631b1c60e 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/Console.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/Console.kt @@ -7,7 +7,6 @@ package kotlin.io -import kotlin.text.* import java.io.InputStream import java.nio.Buffer import java.nio.ByteBuffer @@ -219,4 +218,4 @@ private fun Buffer.flipBack() { private fun CharBuffer.dequeue(): Char { flip() return get().also { compact() } -} \ No newline at end of file +} diff --git a/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt b/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt index 4c41428db06..b2ef7188f35 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt @@ -5,7 +5,6 @@ package kotlin.io -import kotlin.text.* import java.io.File import java.io.IOException diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt index 91494259adc..2c065f4704e 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt @@ -9,7 +9,6 @@ package kotlin.io import java.io.File -import kotlin.* /** * Estimation of a root name by a given file name. diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt b/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt index 82cf6547a3c..a073f9f2500 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt @@ -8,7 +8,6 @@ package kotlin.io -import kotlin.* import java.io.File import java.io.IOException import java.util.Stack diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt index 4d3dbe8499d..8cfab418f26 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt @@ -8,11 +8,8 @@ package kotlin.io -import java.io.* -import java.util.* -import kotlin.* -import kotlin.text.* -import kotlin.comparisons.* +import java.io.File +import java.io.IOException /** * Creates an empty directory in the specified [directory], using the given [prefix] and [suffix] to generate its name. diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt b/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt index 224793c2fcb..5f9c5f4be9a 100644 --- a/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt +++ b/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt @@ -5,8 +5,6 @@ package kotlin.jvm.internal.unsafe -import kotlin.* - private fun monitorEnter(@Suppress("UNUSED_PARAMETER") monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately") diff --git a/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt b/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt index 5067f3ece80..c43aa1b03d3 100644 --- a/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt @@ -8,8 +8,6 @@ package kotlin.ranges -import kotlin.* - /** * A closed range of values of type `Float`. * diff --git a/libraries/stdlib/jvm/src/kotlin/system/Process.kt b/libraries/stdlib/jvm/src/kotlin/system/Process.kt index c9b7df84fed..f9e9e253236 100644 --- a/libraries/stdlib/jvm/src/kotlin/system/Process.kt +++ b/libraries/stdlib/jvm/src/kotlin/system/Process.kt @@ -6,8 +6,6 @@ @file:kotlin.jvm.JvmName("ProcessKt") package kotlin.system -import kotlin.* - /** * Terminates the currently running Java Virtual Machine. The * argument serves as a status code; by convention, a nonzero status @@ -19,4 +17,4 @@ import kotlin.* public inline fun exitProcess(status: Int): Nothing { System.exit(status) throw RuntimeException("System.exit returned normally, while it was supposed to halt JVM.") -} \ No newline at end of file +} diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt b/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt index 5762b64f145..3e031b4f726 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt @@ -5,8 +5,6 @@ package kotlin.text -import kotlin.* - /** * Represents the character general category in the Unicode specification. */ @@ -172,4 +170,4 @@ public enum class CharCategory(public val value: Int, public val code: String) { public fun valueOf(category: Int): CharCategory = categoryMap[category] ?: throw IllegalArgumentException("Category #$category is not defined.") } -} \ No newline at end of file +} diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt b/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt index 8ccc80adcbb..790ea235637 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt @@ -5,8 +5,6 @@ package kotlin.text -import kotlin.* - /** * Represents the Unicode directionality of a character. * Character directionality is used to calculate the diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt index 2ae9acdab59..d00cf78d2e1 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt @@ -2,14 +2,12 @@ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ + @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CharsKt") - package kotlin.text -import kotlin.* - /** * Returns `true` if this character (Unicode code point) is defined in Unicode. */ @@ -158,4 +156,4 @@ internal actual fun checkRadix(radix: Int): Int { throw IllegalArgumentException("radix $radix was not in valid range ${Character.MIN_RADIX..Character.MAX_RADIX}") } return radix -} \ No newline at end of file +} diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt index a3721302e17..f571e5c47a2 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt @@ -9,9 +9,6 @@ package kotlin.text -import kotlin.* - - /** * Returns a string representation of this [Byte] value in the specified [radix]. * diff --git a/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt b/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt index 8e29903c9e5..31c84106c95 100644 --- a/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt @@ -8,7 +8,6 @@ package kotlin.math -import kotlin.* import kotlin.internal.InlineOnly import kotlin.math.Constants.LN2 import kotlin.math.Constants.taylor_2_bound @@ -16,7 +15,6 @@ import kotlin.math.Constants.taylor_n_bound import kotlin.math.Constants.upper_taylor_2_bound import kotlin.math.Constants.upper_taylor_n_bound - import java.lang.Math as nativeMath private object Constants { diff --git a/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt index 4a80fcd9289..c1b7a815bff 100644 --- a/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt +++ b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt @@ -6,12 +6,10 @@ package test.collections import test.assertStaticAndRuntimeTypeIs -import kotlin.test.* -import kotlin.comparisons.* -import java.util.* - import test.io.deserializeFromHex import test.io.serializeAndDeserialize +import java.util.* +import kotlin.test.* class CollectionJVMTest { diff --git a/libraries/stdlib/jvm/test/collections/MapJVMTest.kt b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt index 9f5d9168df6..59eb12e0d5e 100644 --- a/libraries/stdlib/jvm/test/collections/MapJVMTest.kt +++ b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt @@ -8,7 +8,6 @@ package test.collections import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap import kotlin.test.* -import kotlin.comparisons.* class MapJVMTest { @Test fun createSortedMap() { diff --git a/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt index 7da28989e5f..99852df10ed 100644 --- a/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt +++ b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt @@ -5,8 +5,6 @@ package test.utils - -import kotlin.* import kotlin.test.* import kotlin.concurrent.thread import test.io.serializeAndDeserialize diff --git a/libraries/stdlib/src/kotlin/collections/AbstractList.kt b/libraries/stdlib/src/kotlin/collections/AbstractList.kt index c5e6e7e8d07..e54b11879df 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractList.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractList.kt @@ -9,8 +9,6 @@ package kotlin.collections -import kotlin.* - /** * Provides a skeletal implementation of the read-only [List] interface. * diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt index 6bf7b307f1e..e5637c77fa1 100644 --- a/libraries/stdlib/src/kotlin/collections/Collections.kt +++ b/libraries/stdlib/src/kotlin/collections/Collections.kt @@ -8,8 +8,6 @@ package kotlin.collections -import kotlin.* -import kotlin.comparisons.compareValues import kotlin.contracts.* internal object EmptyIterator : ListIterator { diff --git a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt index 078d10267f2..b030f3d6225 100644 --- a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt +++ b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt @@ -2,14 +2,12 @@ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ + @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("CollectionsKt") package kotlin.collections -import kotlin.* - - private open class ReversedListReadOnly(private val delegate: List) : AbstractList() { override val size: Int get() = delegate.size override fun get(index: Int): T = delegate[reverseElementIndex(index)] diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt index 0e4a05636ef..bcffeec2b00 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequences.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt @@ -8,8 +8,6 @@ package kotlin.sequences -import kotlin.* - /** * Given an [iterator] function constructs a [Sequence] that returns values through the [Iterator] * provided by that function. diff --git a/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt b/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt index 16cb65b751e..1c84efbf9e2 100644 --- a/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt +++ b/libraries/stdlib/src/kotlin/collections/SlidingWindow.kt @@ -5,8 +5,6 @@ package kotlin.collections -import kotlin.* - internal fun checkWindowSizeStep(size: Int, step: Int) { require(size > 0 && step > 0) { if (size != step) @@ -196,4 +194,4 @@ private class RingBuffer(val capacity: Int) : AbstractList(), RandomAccess this[idx] = element } } -} \ No newline at end of file +} diff --git a/libraries/stdlib/src/kotlin/properties/Delegates.kt b/libraries/stdlib/src/kotlin/properties/Delegates.kt index a648857c9d8..9dce389e506 100644 --- a/libraries/stdlib/src/kotlin/properties/Delegates.kt +++ b/libraries/stdlib/src/kotlin/properties/Delegates.kt @@ -5,7 +5,6 @@ package kotlin.properties -import kotlin.* import kotlin.reflect.KProperty /** diff --git a/libraries/stdlib/src/kotlin/random/Random.kt b/libraries/stdlib/src/kotlin/random/Random.kt index a89d4a4e162..d17b61272ff 100644 --- a/libraries/stdlib/src/kotlin/random/Random.kt +++ b/libraries/stdlib/src/kotlin/random/Random.kt @@ -5,7 +5,6 @@ package kotlin.random -import kotlin.* import kotlin.math.nextDown /** diff --git a/libraries/stdlib/src/kotlin/ranges/Ranges.kt b/libraries/stdlib/src/kotlin/ranges/Ranges.kt index 1bee0e844ce..00d34d42a0c 100644 --- a/libraries/stdlib/src/kotlin/ranges/Ranges.kt +++ b/libraries/stdlib/src/kotlin/ranges/Ranges.kt @@ -8,8 +8,6 @@ package kotlin.ranges -import kotlin.* - /** * Represents a range of floating point numbers. * Extends [ClosedRange] interface providing custom operation [lessThanOrEquals] for comparing values of range domain type. diff --git a/libraries/stdlib/src/kotlin/text/StringNumberConversions.kt b/libraries/stdlib/src/kotlin/text/StringNumberConversions.kt index f8aacf58090..0d2a392762e 100644 --- a/libraries/stdlib/src/kotlin/text/StringNumberConversions.kt +++ b/libraries/stdlib/src/kotlin/text/StringNumberConversions.kt @@ -9,10 +9,6 @@ package kotlin.text -import kotlin.* - - - /** * Parses the string as a signed [Byte] number and returns the result * or `null` if the string is not a valid representation of a number. @@ -180,4 +176,4 @@ public fun String.toLongOrNull(radix: Int): Long? { } -internal fun numberFormatError(input: String): Nothing = throw NumberFormatException("Invalid number format: '$input'") \ No newline at end of file +internal fun numberFormatError(input: String): Nothing = throw NumberFormatException("Invalid number format: '$input'") diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index c32f341a46c..82d53bdc07f 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -6,14 +6,10 @@ @file:kotlin.jvm.JvmMultifileClass @file:kotlin.jvm.JvmName("StringsKt") - package kotlin.text -import kotlin.* -import kotlin.comparisons.* import kotlin.contracts.contract - /** * Returns a sub sequence of this char sequence having leading and trailing characters matching the [predicate] removed. */ diff --git a/libraries/stdlib/test/OrderingTest.kt b/libraries/stdlib/test/OrderingTest.kt index 3286c946203..bf0769c6565 100644 --- a/libraries/stdlib/test/OrderingTest.kt +++ b/libraries/stdlib/test/OrderingTest.kt @@ -6,7 +6,6 @@ package test.comparisons import kotlin.test.* -import kotlin.comparisons.* data class Item(val name: String, val rating: Int) : Comparable { public override fun compareTo(other: Item): Int { diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt index 618386adf2a..8574ddc2fcf 100644 --- a/libraries/stdlib/test/collections/ArraysTest.kt +++ b/libraries/stdlib/test/collections/ArraysTest.kt @@ -4,6 +4,7 @@ */ @file:Suppress("SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED") + package test.collections import test.assertStaticTypeIs @@ -11,7 +12,6 @@ import test.assertTypeEquals import test.collections.behaviors.* import test.comparisons.STRING_CASE_INSENSITIVE_ORDER import kotlin.test.* -import kotlin.comparisons.* import kotlin.random.Random fun assertArrayNotSameButEquals(expected: Array, actual: Array, message: String = "") { assertTrue(expected !== actual && expected contentEquals actual, message) } @@ -1433,4 +1433,4 @@ private class ArraySortedChecker(val array: A, val comparator: Comparator< array.sorted().iterator().assertSorted { a, b -> comparator.compare(a, b) <= 0 } array.sortedDescending().iterator().assertSorted { a, b -> comparator.compare(a, b) >= 0 } } -} \ No newline at end of file +} diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index abe91f09a99..22fcbbf7be0 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -9,7 +9,6 @@ import test.assertStaticAndRuntimeTypeIs import kotlin.test.* import test.collections.behaviors.* import test.comparisons.STRING_CASE_INSENSITIVE_ORDER -import kotlin.comparisons.* import kotlin.math.sin import kotlin.random.Random diff --git a/libraries/stdlib/test/collections/ListBinarySearchTest.kt b/libraries/stdlib/test/collections/ListBinarySearchTest.kt index 762e1170167..525bd6e5b6b 100644 --- a/libraries/stdlib/test/collections/ListBinarySearchTest.kt +++ b/libraries/stdlib/test/collections/ListBinarySearchTest.kt @@ -6,7 +6,6 @@ package test.collections.binarySearch import kotlin.test.* -import kotlin.comparisons.* class ListBinarySearchTest { diff --git a/libraries/stdlib/test/collections/SequenceTest.kt b/libraries/stdlib/test/collections/SequenceTest.kt index ff1b239e483..8d6256f664a 100644 --- a/libraries/stdlib/test/collections/SequenceTest.kt +++ b/libraries/stdlib/test/collections/SequenceTest.kt @@ -6,7 +6,6 @@ package test.collections import kotlin.test.* -import kotlin.comparisons.* fun fibonacci(): Sequence { // fibonacci terms @@ -577,4 +576,4 @@ public class SequenceTest { } */ -} \ No newline at end of file +} diff --git a/libraries/stdlib/test/js/JsCollectionsTest.kt b/libraries/stdlib/test/js/JsCollectionsTest.kt index fc114c6285e..a2178646df9 100644 --- a/libraries/stdlib/test/js/JsCollectionsTest.kt +++ b/libraries/stdlib/test/js/JsCollectionsTest.kt @@ -6,7 +6,6 @@ package test.collections.js import kotlin.test.* -import kotlin.comparisons.* class JsCollectionsTest { val TEST_LIST = arrayOf(2, 0, 9, 7, 1).toList() diff --git a/libraries/stdlib/test/numbers/NaNPropagationTest.kt b/libraries/stdlib/test/numbers/NaNPropagationTest.kt index dc815c12de3..ffb8ab9816e 100644 --- a/libraries/stdlib/test/numbers/NaNPropagationTest.kt +++ b/libraries/stdlib/test/numbers/NaNPropagationTest.kt @@ -6,7 +6,6 @@ package numbers import kotlin.test.* -import kotlin.comparisons.* val Double.Companion.values get() = listOf(0.0, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN) val Float.Companion.values get() = listOf(0.0f, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN) @@ -198,4 +197,4 @@ class NaNTotalOrderTest { fun sequenceTMax() { totalOrderMaxOf2>({ a, b -> sequenceOf(a, b).max()!! }, "sequenceOf().max()") } -} \ No newline at end of file +} diff --git a/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt index adeadf7dba4..d0d3f075919 100644 --- a/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt +++ b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt @@ -5,10 +5,8 @@ package test.ranges -import kotlin.comparisons.* import kotlin.test.* - class ProgressionLastElementTest { private val MAX = Int.MAX_VALUE diff --git a/libraries/stdlib/test/text/RegexTest.kt b/libraries/stdlib/test/text/RegexTest.kt index d07c4a4b692..af639965547 100644 --- a/libraries/stdlib/test/text/RegexTest.kt +++ b/libraries/stdlib/test/text/RegexTest.kt @@ -4,9 +4,8 @@ */ @file:Suppress("NAMED_ARGUMENTS_NOT_ALLOWED") // for common tests -package test.text -import kotlin.text.* +package test.text import kotlin.test.* @@ -223,4 +222,4 @@ class RegexTest { -} \ No newline at end of file +} diff --git a/libraries/stdlib/test/utils/LazyTest.kt b/libraries/stdlib/test/utils/LazyTest.kt index 93428aef7a2..28bf20ebc68 100644 --- a/libraries/stdlib/test/utils/LazyTest.kt +++ b/libraries/stdlib/test/utils/LazyTest.kt @@ -5,7 +5,6 @@ package test.utils -import kotlin.* import kotlin.test.* class LazyTest { @@ -43,4 +42,4 @@ class LazyTest { assertEquals("1", lazyInt.toString()) assertEquals(1, callCount) } -} \ No newline at end of file +} diff --git a/libraries/stdlib/test/utils/TODOTest.kt b/libraries/stdlib/test/utils/TODOTest.kt index bb7827c2a6a..1c3976fd105 100644 --- a/libraries/stdlib/test/utils/TODOTest.kt +++ b/libraries/stdlib/test/utils/TODOTest.kt @@ -5,7 +5,6 @@ package test.utils -import kotlin.* import kotlin.test.* class TODOTest { diff --git a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt index cca25380b5c..e2849ece17c 100644 --- a/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt +++ b/libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools/asmUtils.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.tools import kotlinx.metadata.jvm.* import org.objectweb.asm.Opcodes import org.objectweb.asm.tree.* -import kotlin.comparisons.* val ACCESS_NAMES = mapOf( Opcodes.ACC_PUBLIC to "public", @@ -187,4 +186,4 @@ private fun findAnnotation(annotationName: String, visibleAnnotations: List.writeTo(file: File, platformSource: PlatformSourceFile) writer.appendln("import withType") } } - writer.appendln("import kotlin.*") - writer.appendln("import kotlin.text.*") - writer.appendln("import kotlin.comparisons.*") if (platform == Platform.Common) { writer.appendln("import kotlin.random.*") }