From 73e41fb2169b5491bcc5e0781b7d087b57e1a2ab Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Sep 2015 22:13:42 +0300 Subject: [PATCH] StdLib cleanup: remove unused imports --- libraries/stdlib/src/kotlin/collections/AbstractIterator.kt | 3 --- libraries/stdlib/src/kotlin/io/IOStreams.kt | 2 -- libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt | 2 -- libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt | 2 -- libraries/stdlib/src/kotlin/properties/MapAccessors.kt | 3 --- libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt | 2 -- libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt | 2 -- libraries/stdlib/src/kotlin/text/StringsJVM.kt | 2 -- libraries/stdlib/src/kotlin/util/JLangJVM.kt | 1 - libraries/stdlib/test/DataClassTest.kt | 2 +- libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt | 2 -- libraries/stdlib/test/ExceptionTest.kt | 1 - libraries/stdlib/test/OldStdlibTest.kt | 2 -- libraries/stdlib/test/collections/MapJVMTest.kt | 5 +++-- libraries/stdlib/test/io/Files.kt | 4 +--- libraries/stdlib/test/io/IOStreams.kt | 1 - .../stdlib/test/properties/delegation/lazy/LazyValuesTest.kt | 3 +-- libraries/stdlib/test/text/RegexJVMTest.kt | 1 - 18 files changed, 6 insertions(+), 34 deletions(-) diff --git a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt index 22a94cbc13b..85bba16a894 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt @@ -2,9 +2,6 @@ package kotlin.support import java.util.NoSuchElementException -// TODO should not need this - its here for the JS stuff -import java.lang.UnsupportedOperationException - private enum class State { Ready, NotReady, diff --git a/libraries/stdlib/src/kotlin/io/IOStreams.kt b/libraries/stdlib/src/kotlin/io/IOStreams.kt index 8d0e7aae6e2..1f50ac77fce 100644 --- a/libraries/stdlib/src/kotlin/io/IOStreams.kt +++ b/libraries/stdlib/src/kotlin/io/IOStreams.kt @@ -4,8 +4,6 @@ package kotlin.io import java.io.* import java.nio.charset.Charset -import java.nio.charset.CharsetDecoder -import java.nio.charset.CharsetEncoder import java.util.NoSuchElementException /** Returns an [Iterator] of bytes in this input stream. */ diff --git a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt index 07b46e8c16b..3dce801dff2 100644 --- a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt +++ b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt @@ -4,8 +4,6 @@ package kotlin.io import java.io.File -import java.util.Collections -import java.util.NoSuchElementException import kotlin.text.Regex /** diff --git a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt index 6c0725e61af..f83a4095018 100644 --- a/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt +++ b/libraries/stdlib/src/kotlin/io/files/FileTreeWalk.kt @@ -4,9 +4,7 @@ package kotlin.io import java.io.File -import java.io.FileNotFoundException import java.io.IOException -import java.util.ArrayList import java.util.NoSuchElementException import java.util.Stack diff --git a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt index 9d8a32725b7..93f0568985e 100644 --- a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt +++ b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt @@ -1,9 +1,6 @@ @file:kotlin.jvm.JvmName("MapAccessorsKt") package kotlin.properties -import java.io.Serializable -import java.util.NoSuchElementException - // extensions for Map and MutableMap /** diff --git a/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt b/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt index 5989779e3bd..0aca0b1337d 100644 --- a/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt +++ b/libraries/stdlib/src/kotlin/text/CharCategoryJVM.kt @@ -1,7 +1,5 @@ package kotlin -import kotlin.properties.Delegates - /** * Represents the character general category in the Unicode specification. */ diff --git a/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt b/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt index 98ca7f421ff..a73593cf679 100644 --- a/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt +++ b/libraries/stdlib/src/kotlin/text/CharDirectionalityJVM.kt @@ -1,7 +1,5 @@ package kotlin -import kotlin.properties.Delegates - /** * Represents the Unicode directionality of a character. * Character directionality is used to calculate the diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt index 5e27b8690c5..940b9664b86 100644 --- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt @@ -4,11 +4,9 @@ package kotlin import java.io.StringReader -import java.util.regex.MatchResult import java.util.regex.Pattern import java.nio.charset.Charset import java.util.* -import kotlin.text.Regex /** diff --git a/libraries/stdlib/src/kotlin/util/JLangJVM.kt b/libraries/stdlib/src/kotlin/util/JLangJVM.kt index 9a756b164c8..4229f83bd15 100644 --- a/libraries/stdlib/src/kotlin/util/JLangJVM.kt +++ b/libraries/stdlib/src/kotlin/util/JLangJVM.kt @@ -3,7 +3,6 @@ package kotlin import java.lang.reflect.Method -import kotlin.jvm.internal.unsafe.* import kotlin.jvm.internal.Intrinsic import kotlin.reflect.KClass diff --git a/libraries/stdlib/test/DataClassTest.kt b/libraries/stdlib/test/DataClassTest.kt index 089888cfc68..9814403466a 100644 --- a/libraries/stdlib/test/DataClassTest.kt +++ b/libraries/stdlib/test/DataClassTest.kt @@ -2,7 +2,7 @@ package test.dataclass import org.junit.Test import kotlin.test.* -import java.io.Serializable + /** */ diff --git a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt b/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt index ebb4c0b18a4..2bdbb420521 100644 --- a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt +++ b/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt @@ -18,8 +18,6 @@ package test.numbers import kotlin.test.* -import java.util.* -import kotlin.test.* import org.junit.Test as test class CompanionObjectsExtensionsTest { diff --git a/libraries/stdlib/test/ExceptionTest.kt b/libraries/stdlib/test/ExceptionTest.kt index 132a3193e17..a0c15590988 100644 --- a/libraries/stdlib/test/ExceptionTest.kt +++ b/libraries/stdlib/test/ExceptionTest.kt @@ -2,7 +2,6 @@ package test.collections import kotlin.test.* -import java.util.* import org.junit.Test as test import java.io.PrintWriter import java.io.* diff --git a/libraries/stdlib/test/OldStdlibTest.kt b/libraries/stdlib/test/OldStdlibTest.kt index 1c934dbfdc0..c38b64c78c2 100644 --- a/libraries/stdlib/test/OldStdlibTest.kt +++ b/libraries/stdlib/test/OldStdlibTest.kt @@ -3,8 +3,6 @@ package test.collections import kotlin.* import kotlin.io.* import kotlin.test.* -import java.util.* -import java.io.* import org.junit.Test as test class OldStdlibTest() { diff --git a/libraries/stdlib/test/collections/MapJVMTest.kt b/libraries/stdlib/test/collections/MapJVMTest.kt index 44740e5dc81..3c1dcbfe8bf 100644 --- a/libraries/stdlib/test/collections/MapJVMTest.kt +++ b/libraries/stdlib/test/collections/MapJVMTest.kt @@ -1,8 +1,9 @@ package test.collections import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.ConcurrentMap -import kotlin.test.* +import kotlin.test.assertEquals +import kotlin.test.assertFails +import kotlin.test.expect import org.junit.Test as test class MapJVMTest { diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/test/io/Files.kt index 37f162c9445..aca33fd962b 100644 --- a/libraries/stdlib/test/io/Files.kt +++ b/libraries/stdlib/test/io/Files.kt @@ -8,9 +8,7 @@ import java.util.HashSet import java.util.ArrayList import kotlin.io.walkBottomUp import kotlin.io.walkTopDown -import kotlin.test.assertFalse -import kotlin.test.assertNull -import kotlin.test.assertTrue +import kotlin.test.* class FilesTest { diff --git a/libraries/stdlib/test/io/IOStreams.kt b/libraries/stdlib/test/io/IOStreams.kt index b57b574c7c5..cc8c3cf9e09 100644 --- a/libraries/stdlib/test/io/IOStreams.kt +++ b/libraries/stdlib/test/io/IOStreams.kt @@ -4,7 +4,6 @@ import org.junit.Test as test import kotlin.test.* import java.io.Writer import java.io.BufferedReader -import java.io.File class IOStreamsTest { @test fun testGetStreamOfFile() { diff --git a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt b/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt index 1a490a87d4e..e706fa4dd5d 100644 --- a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt +++ b/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt @@ -2,8 +2,7 @@ package test.properties.delegation.lazy import org.junit.Test as test import kotlin.properties.* -import kotlin.test.assertNotNull -import kotlin.test.assertTrue +import kotlin.test.* class LazyValTest { var result = 0 diff --git a/libraries/stdlib/test/text/RegexJVMTest.kt b/libraries/stdlib/test/text/RegexJVMTest.kt index f77953f5dde..46dcf8c1670 100644 --- a/libraries/stdlib/test/text/RegexJVMTest.kt +++ b/libraries/stdlib/test/text/RegexJVMTest.kt @@ -1,7 +1,6 @@ package test.text import kotlin.test.* -import kotlin.text.* import org.junit.Test as test