diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-19 16:29:14 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-20 14:44:31 -0800 |
| commit | 733f7f086834b549e33a01b5d7504ac2d1353815 (patch) | |
| tree | 4f1e747756b33be13544fdd15e707ce7afdb17f8 /test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala | |
| parent | c243435f113615b2f7407fbd683c93ec16c73749 (diff) | |
| download | scala-733f7f086834b549e33a01b5d7504ac2d1353815.tar.gz scala-733f7f086834b549e33a01b5d7504ac2d1353815.tar.bz2 scala-733f7f086834b549e33a01b5d7504ac2d1353815.zip | |
Prepare upgrade to scalacheck 1.11.
Our scalacheck tests now compile against 1.10.1 and 1.11.0.
They pass on 1.10.1, but fail on 1.11.0.
Once (that)[https://github.com/rickynils/scalacheck/issues/79]'s fixed,
and 1.11.1 released, we should be able to upgrade to it by simply
changing scalacheck.version.number in versions.properties.
The changes are mostly removing dead code (e.g., consolereporter business).
Of interest: the type ascription for `oneOf`. I haven't quite investigated,
but something seems to have changed between 1.10.1 and 1.11.0 that caused
a different overload to be picked without the type ascription.
Probably not a scalac bug, just a scalacheck api change.
Diffstat (limited to 'test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala')
| -rw-r--r-- | test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala b/test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala index c4b93dae48..7905a2ca15 100644 --- a/test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala +++ b/test/files/scalacheck/quasiquotes/ArbitraryTreesAndNames.scala @@ -222,7 +222,7 @@ trait ArbitraryTreesAndNames { yield ValDef(mods, name, tpt, rhs) def genTree(size: Int): Gen[Tree] = - if (size <= 1) oneOf(EmptyTree, genTreeIsTerm(size), genTreeIsType(size)) + if (size <= 1) oneOf(EmptyTree: Gen[Tree], genTreeIsTerm(size), genTreeIsType(size)) else oneOf(genTree(1), // these trees are neither terms nor types genPackageDef(size - 1), genModuleDef(size - 1), @@ -273,8 +273,8 @@ trait ArbitraryTreesAndNames { def apply(universe: Universe, value: TreeIsType): universe.Tree = value.tree.asInstanceOf[universe.Tree] } - implicit def treeIsTerm2tree(tit: TreeIsTerm) = tit.tree - implicit def treeIsType2tree(tit: TreeIsType) = tit.tree + implicit def treeIsTerm2tree(tit: TreeIsTerm): Tree = tit.tree + implicit def treeIsType2tree(tit: TreeIsType): Tree = tit.tree implicit val arbConstant: Arbitrary[Constant] = Arbitrary(genConstant) implicit val arbModifiers: Arbitrary[Modifiers] = Arbitrary(genModifiers) |