diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-16 16:58:28 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-16 19:25:38 +0100 |
| commit | 862f7709cdabd82327ca0f37a480884c88f96be7 (patch) | |
| tree | 688717816eeee19ddb391f1009c82d9b6f09f224 /test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala | |
| parent | 2fc0164a5e777a0495c1801d8d38d60158ec2a77 (diff) | |
| parent | 6ef6c96eff2f0d2f505d45a1436d73a960193076 (diff) | |
| download | scala-862f7709cdabd82327ca0f37a480884c88f96be7.tar.gz scala-862f7709cdabd82327ca0f37a480884c88f96be7.tar.bz2 scala-862f7709cdabd82327ca0f37a480884c88f96be7.zip | |
Merge remote-tracking branch 'origin/master' into topic/palladium0
Conflicts:
src/compiler/scala/reflect/macros/compiler/Resolvers.scala
src/compiler/scala/reflect/macros/contexts/Typers.scala
src/compiler/scala/tools/reflect/ToolBoxFactory.scala
src/reflect/scala/reflect/api/BuildUtils.scala
Diffstat (limited to 'test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala')
| -rw-r--r-- | test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala b/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala index 2600b0c120..6132244227 100644 --- a/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala +++ b/test/files/scalacheck/quasiquotes/QuasiquoteProperties.scala @@ -28,7 +28,7 @@ trait Helpers { override def transform(tree: Tree): Tree = tree match { case Ident(SimplifiedName(name)) => Ident(name) - case ValDef(mods, SimplifiedName(name), tpt, rhs) => ValDef(mods, name, tpt, rhs) + case ValDef(mods, SimplifiedName(name), tpt, rhs) => ValDef(mods, name, transform(tpt), transform(rhs)) case Bind(SimplifiedName(name), rhs) => Bind(name, rhs) case _ => super.transform(tree) |