Skip to content

Commit d2ee645

Browse files
committed
fixed accidental reference to this.iterator in CloseableIterator
1 parent 1379e29 commit d2ee645

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

commons-core/src/main/scala/com/avsystem/commons/collection/CloseableIterator.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ object CloseableIterator {
2727
def empty[T]: CloseableIterator[T] =
2828
noop(Iterator.empty)
2929

30-
def noop[T](iterator: Iterator[T]): CloseableIterator[T] =
31-
apply(iterator, emptyCloseable)
30+
def noop[T](it: Iterator[T]): CloseableIterator[T] =
31+
apply(it, emptyCloseable)
3232

33-
def noop[T](iterator: JIterator[T]): CloseableIterator[T] =
34-
apply(iterator, emptyCloseable)
33+
def noop[T](it: JIterator[T]): CloseableIterator[T] =
34+
apply(it, emptyCloseable)
3535

36-
def apply[T](iterator: JIterator[T] with AutoCloseable): CloseableIterator[T] =
37-
apply(iterator, iterator)
36+
def apply[T](it: JIterator[T] with AutoCloseable): CloseableIterator[T] =
37+
apply(it, it)
3838

39-
def apply[T](iterator: JIterator[T], closeable: AutoCloseable): CloseableIterator[T] =
39+
def apply[T](it: JIterator[T], closeable: AutoCloseable): CloseableIterator[T] =
4040
new CloseableIterator[T] {
4141
def close(): Unit = closeable.close()
4242
@silent("non-nullary method overrides nullary method")
43-
def hasNext: Boolean = iterator.hasNext
44-
def next(): T = iterator.next()
43+
def hasNext: Boolean = it.hasNext
44+
def next(): T = it.next()
4545
}
4646

47-
def apply[T](iterator: Iterator[T] with AutoCloseable): CloseableIterator[T] =
48-
apply(iterator, iterator)
47+
def apply[T](it: Iterator[T] with AutoCloseable): CloseableIterator[T] =
48+
apply(it, it)
4949

50-
def apply[T](iterator: Iterator[T], closeable: AutoCloseable): CloseableIterator[T] =
50+
def apply[T](it: Iterator[T], closeable: AutoCloseable): CloseableIterator[T] =
5151
new CloseableIterator[T] {
5252
def close(): Unit = closeable.close()
5353
@silent("non-nullary method overrides nullary method")
54-
def hasNext: Boolean = iterator.hasNext
55-
def next(): T = iterator.next()
54+
def hasNext: Boolean = it.hasNext
55+
def next(): T = it.next()
5656
}
5757
}

0 commit comments

Comments
 (0)