summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/library/scala/collection/generic/IterableTemplate.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala
index 40f66e2d38..8e05b95c29 100644
--- a/src/library/scala/collection/generic/IterableTemplate.scala
+++ b/src/library/scala/collection/generic/IterableTemplate.scala
@@ -136,8 +136,11 @@ trait IterableTemplate[+A, +This <: IterableTemplate[A, This] with Iterable[A]]
def sameElements[B >: A](that: Iterable[B]): Boolean = {
val these = this.elements
val those = that.elements
- while (these.hasNext && those.hasNext && these.next() == those.next()) {}
- !these.hasNext && !those.hasNext
+ var res = true
+ while (res && these.hasNext && those.hasNext) {
+ res = (these.next == those.next)
+ }
+ !these.hasNext && !those.hasNext && res
}
/** Returns a stream with all elements in this traversable object.