From a3194e9a46d56e8458fc1ff5c6693b6e17d0f9ec Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 29 Aug 2012 15:10:57 +0400 Subject: [PATCH] removed unnecessary import jet.Iterator --- compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt | 1 - compiler/testData/diagnostics/tests/regressions/kt860.kt | 1 - .../testFiles/expression/misc/cases/iterableExtension.kt | 1 - libraries/stdlib/src/generated/ArraysFromJLangIterables.kt | 1 - libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt | 1 - .../stdlib/src/generated/BooleanArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt | 1 - libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt | 1 - .../stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt | 1 - .../stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt | 1 - .../stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt | 1 - libraries/stdlib/src/kotlin/JLangIterables.kt | 1 - libraries/stdlib/src/kotlin/JLangIterablesJVM.kt | 1 - libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt | 1 - libraries/stdlib/src/kotlin/dom/Dom.kt | 1 - libraries/stdlib/src/kotlin/dom/DomJVM.kt | 1 - libraries/stdlib/test/CollectionTest.kt | 1 - 29 files changed, 29 deletions(-) diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt index e303e505c42..dfa950e6192 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt @@ -3,7 +3,6 @@ // KT-441 Exception in type inference when multiple overloads accepting an integer literal are accessible import java.util.* -import jet.Iterator fun Iterator.foreach(operation: (element: T) -> Unit) : Unit = while(hasNext()) operation(next()) diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.kt b/compiler/testData/diagnostics/tests/regressions/kt860.kt index 748da9b3d27..5f5e2a352b9 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt860.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt860.kt @@ -3,7 +3,6 @@ package kotlin.util import java.util.* -import jet.Iterator fun > Iterator.to(container: U) : U { while(hasNext()) diff --git a/js/js.translator/testFiles/expression/misc/cases/iterableExtension.kt b/js/js.translator/testFiles/expression/misc/cases/iterableExtension.kt index 7d92f125bb9..24e7c12027e 100644 --- a/js/js.translator/testFiles/expression/misc/cases/iterableExtension.kt +++ b/js/js.translator/testFiles/expression/misc/cases/iterableExtension.kt @@ -2,7 +2,6 @@ package foo import java.util.* import java.lang.* -import jet.Iterator public inline fun > Iterator.takeWhileTo(result: C, predicate: (T) -> Boolean) : C { for (element in this) if (predicate(element)) result.add(element) else break diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt index ee4569b2e52..4ad6e01a556 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt index 4100418d756..9b6d60ff6aa 100644 --- a/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun Array.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt index ce548221fef..0ec278cc00d 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt index a55e632db78..f46d1cc4214 100644 --- a/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/BooleanArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun BooleanArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt index 7d30eb7d4e4..26c401006fa 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt index 16a0be6bfeb..0abc222ae9b 100644 --- a/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ByteArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun ByteArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt index c012a8a3ebd..59ee1397e0b 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/CharArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt index 1200ff867f1..9c6027558ba 100644 --- a/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/CharArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun CharArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt index c9ad6c3f7f1..0871d26d1c2 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt index a5c3b8735da..7a0fba09243 100644 --- a/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/DoubleArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun DoubleArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt index 7e161780a63..0605413783c 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt index 945706f93a0..154bac7ca94 100644 --- a/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/FloatArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun FloatArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt index 6cd5dda1431..d15333865b6 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/IntArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt index 526fd20400f..eb938c89bfe 100644 --- a/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/IntArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun IntArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt index f7eed447dc6..3fb7de475d7 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterables.kt @@ -9,7 +9,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt index 0dbee70b3cc..45563591d06 100644 --- a/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/JUtilIteratorsFromJLangIterablesJVM.kt @@ -9,7 +9,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun Iterator.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt index 1afd97fb176..270a8454b68 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/LongArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt index 97616c0c255..621d07138ba 100644 --- a/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/LongArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun LongArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt index 564a32aa1a6..ba77814c29b 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromJLangIterables.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt b/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt index 595ad0a91a2..457a1e0767e 100644 --- a/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt +++ b/libraries/stdlib/src/generated/ShortArraysFromJLangIterablesJVM.kt @@ -10,7 +10,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun ShortArray.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/kotlin/JLangIterables.kt b/libraries/stdlib/src/kotlin/JLangIterables.kt index f75b1dc5540..aa50b0a78bc 100644 --- a/libraries/stdlib/src/kotlin/JLangIterables.kt +++ b/libraries/stdlib/src/kotlin/JLangIterables.kt @@ -1,7 +1,6 @@ package kotlin import java.util.* -import jet.Iterator /** * Returns *true* if all elements match the given *predicate* diff --git a/libraries/stdlib/src/kotlin/JLangIterablesJVM.kt b/libraries/stdlib/src/kotlin/JLangIterablesJVM.kt index b0859e20e34..741986182f8 100644 --- a/libraries/stdlib/src/kotlin/JLangIterablesJVM.kt +++ b/libraries/stdlib/src/kotlin/JLangIterablesJVM.kt @@ -1,7 +1,6 @@ package kotlin import java.util.* -import jet.Iterator /** Copies all elements into a [[SortedSet]] */ public inline fun Iterable.toSortedSet() : SortedSet = toCollection(TreeSet()) diff --git a/libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt index 4301685e718..2f2fd63ff3d 100644 --- a/libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt +++ b/libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt @@ -1,7 +1,6 @@ package kotlin.concurrent import java.util.concurrent.Executor -import jet.Iterator class FunctionalQueue ( val input: FunctionalList = FunctionalList.emptyList(), diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt index f8b1bbb6fc6..cb2474960f1 100644 --- a/libraries/stdlib/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/src/kotlin/dom/Dom.kt @@ -4,7 +4,6 @@ import kotlin.* import kotlin.support.* import java.util.* import org.w3c.dom.* -import jet.Iterator // TODO should not need this - its here for the JS stuff import java.lang.IllegalArgumentException diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt index 9190416826a..d84342d873b 100644 --- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt +++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt @@ -8,7 +8,6 @@ import java.io.InputStream import java.io.StringWriter import java.io.Writer import java.util.* -import jet.Iterator import javax.xml.parsers.DocumentBuilder import javax.xml.parsers.DocumentBuilderFactory import javax.xml.transform.OutputKeys diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt index 67e73fb6652..9c1c3e66ddf 100644 --- a/libraries/stdlib/test/CollectionTest.kt +++ b/libraries/stdlib/test/CollectionTest.kt @@ -3,7 +3,6 @@ package test.collections import kotlin.test.* import java.util.* -import jet.Iterator import org.junit.Test as test