summaryrefslogtreecommitdiff
path: root/test/files/neg/t5689.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
commitef4c5d2f43e912b5562c1372228e9c6ec9f25bb0 (patch)
treebb7385f1971d1b7869eed8678fb0bfef24082e60 /test/files/neg/t5689.check
parent4065b5136f2d0d1b6b9bb03f6669c1fd8a2b4e64 (diff)
parentb2f67b5730adccc4cbb24e5b542dc66452869489 (diff)
downloadscala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.gz
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.bz2
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.zip
Merge pull request #3355 from xeno-by/topic/saturday-night
reshuffles names for blackbox/whitebox contexts, changes bundle notation
Diffstat (limited to 'test/files/neg/t5689.check')
-rw-r--r--test/files/neg/t5689.check6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t5689.check b/test/files/neg/t5689.check
index 9271f709ca..7d4f7fb63a 100644
--- a/test/files/neg/t5689.check
+++ b/test/files/neg/t5689.check
@@ -1,7 +1,7 @@
t5689.scala:4: error: macro implementation has incompatible shape:
- required: (c: scala.reflect.macros.BlackboxContext)(i: c.Expr[Double]): c.Expr[String]
- or : (c: scala.reflect.macros.BlackboxContext)(i: c.Tree): c.Tree
- found : (c: scala.reflect.macros.BlackboxContext)(i: c.Expr[Double]): c.Expr[Int]
+ required: (c: scala.reflect.macros.blackbox.Context)(i: c.Expr[Double]): c.Expr[String]
+ or : (c: scala.reflect.macros.blackbox.Context)(i: c.Tree): c.Tree
+ found : (c: scala.reflect.macros.blackbox.Context)(i: c.Expr[Double]): c.Expr[Int]
type mismatch for return type: c.Expr[Int] does not conform to c.Expr[String]
def returnsString(i: Double): String = macro returnsIntImpl
^