summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/parallel-collections
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-01-13 17:42:48 +0100
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-27 22:42:02 -0800
commita87d40960bfdb4a683c05d3430a8874cb4dcff36 (patch)
treea65ddd00ebdee081055d982f6408cbfc34e9e62c /test/files/scalacheck/parallel-collections
parent02963d724c512251ce66502226408091686989ee (diff)
downloadscala-a87d40960bfdb4a683c05d3430a8874cb4dcff36.tar.gz
scala-a87d40960bfdb4a683c05d3430a8874cb4dcff36.tar.bz2
scala-a87d40960bfdb4a683c05d3430a8874cb4dcff36.zip
SI-6968 Simple Tuple patterns aren't irrefutable
Reverts part of c82ecab. The parser can't assume that a pattern `(a, b)` will match, as results of `.isInstanceOf[Tuple2]` can't be statically known until after the typer. The reopens SI-1336, SI-5589 and SI-4574, in exchange for fixing this regression SI-6968. Keeping all of those fixed will require a better definition of irrefutability, and some acrobatics to ensure safe passage to the ambiguous trees through typechecking.
Diffstat (limited to 'test/files/scalacheck/parallel-collections')
-rw-r--r--test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala b/test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala
index 05237bace8..b6af8f41bd 100644
--- a/test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala
+++ b/test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala
@@ -20,7 +20,7 @@ abstract class ParallelMapCheck[K, V](collname: String) extends ParallelIterable
property("gets iterated keys") = forAll(collectionPairs) {
case (t, coll) =>
val containsT = for ((k, v) <- t) yield (coll.get(k) == Some(v))
- val containsSelf = for ((k, v) <- coll) yield (coll.get(k) == Some(v))
+ val containsSelf = coll.map { case (k, v) => coll.get(k) == Some(v) }
("Par contains elements of seq map" |: containsT.forall(_ == true)) &&
("Par contains elements of itself" |: containsSelf.forall(_ == true))
}