diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
| commit | a45a78a1d4111709acdc0bca9a1ac869a8e53ea5 (patch) | |
| tree | 5c909c41db2470c460cbb3c33672294c9342b914 /test/files/scalacheck | |
| parent | 26de4394b19d6614b7d414b33f66ebf7adcb8833 (diff) | |
| parent | 644eb7078a11613a06dcaaefb807cbcc44f65ea7 (diff) | |
| download | scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.gz scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.bz2 scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.zip | |
Merge commit '644eb7078a' into wip/fresh-merge2
Conflicts:
build.xml
src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
Diffstat (limited to 'test/files/scalacheck')
| -rw-r--r-- | test/files/scalacheck/parallel-collections/ParallelMapCheck1.scala | 2 |
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)) } |