diff options
author | Paul Phillips <paulp@improving.org> | 2011-08-08 06:56:21 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-08-08 06:56:21 +0000 |
commit | 8b28292b5379a34fad0599335116b9e54ee44e20 (patch) | |
tree | 654c93a14a26e802948aa80664efb7aea7b448d3 /src/scalacheck/org | |
parent | be31934db38a93468b6390e783ca377da6283c19 (diff) | |
download | scala-8b28292b5379a34fad0599335116b9e54ee44e20.tar.gz scala-8b28292b5379a34fad0599335116b9e54ee44e20.tar.bz2 scala-8b28292b5379a34fad0599335116b9e54ee44e20.zip |
Fixing all the tests and source which still use...
Fixing all the tests and source which still use the old for
comprehension syntax with vals where there are no vals and no vals where
there are vals. No review.
Diffstat (limited to 'src/scalacheck/org')
-rw-r--r-- | src/scalacheck/org/scalacheck/Arbitrary.scala | 2 | ||||
-rw-r--r-- | src/scalacheck/org/scalacheck/Gen.scala | 2 | ||||
-rw-r--r-- | src/scalacheck/org/scalacheck/Pretty.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/scalacheck/org/scalacheck/Arbitrary.scala b/src/scalacheck/org/scalacheck/Arbitrary.scala index 91d56b0aec..608b3b9fac 100644 --- a/src/scalacheck/org/scalacheck/Arbitrary.scala +++ b/src/scalacheck/org/scalacheck/Arbitrary.scala @@ -143,7 +143,7 @@ object Arbitrary { /** Arbitrary instance of Date */ implicit lazy val arbDate: Arbitrary[Date] = Arbitrary(for { l <- arbitrary[Long] - d = new Date + val d = new Date } yield new Date(d.getTime + l)) /** Arbitrary instance of Throwable */ diff --git a/src/scalacheck/org/scalacheck/Gen.scala b/src/scalacheck/org/scalacheck/Gen.scala index a253b040cd..f1bf3c87de 100644 --- a/src/scalacheck/org/scalacheck/Gen.scala +++ b/src/scalacheck/org/scalacheck/Gen.scala @@ -399,7 +399,7 @@ object Gen { /** A generator that picks a given number of elements from a list, randomly */ def pick[T](n: Int, g1: Gen[T], g2: Gen[T], gs: Gen[T]*): Gen[Seq[T]] = for { is <- pick(n, 0 until (gs.size+2)) - allGs = gs ++ (g1::g2::Nil) + val allGs = gs ++ (g1::g2::Nil) xs <- sequence[List,T](is.toList.map(allGs(_))) } yield xs diff --git a/src/scalacheck/org/scalacheck/Pretty.scala b/src/scalacheck/org/scalacheck/Pretty.scala index f59ac315c7..9e215c4cb7 100644 --- a/src/scalacheck/org/scalacheck/Pretty.scala +++ b/src/scalacheck/org/scalacheck/Pretty.scala @@ -86,7 +86,7 @@ object Pretty { "> Collected test data: " / { for { (xs,r) <- fm.getRatios - ys = xs - () + val ys = xs - () if !ys.isEmpty } yield round(r*100)+"% " + ys.mkString(", ") }.mkString("\n") |