summaryrefslogtreecommitdiff
path: root/test/files/neg/macro-invalidret.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-03 23:50:38 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-03 23:50:38 -0800
commit7d28c4966e5b32b46fda927f303aea4af20c4517 (patch)
tree27bbc3019e73d75253433b3c4602dba9c82cf529 /test/files/neg/macro-invalidret.check
parent394da59828b830f639d2418960052655d9dd040a (diff)
parent1d3ec4e708154ec05554f540d7d68ed55dc12426 (diff)
downloadscala-7d28c4966e5b32b46fda927f303aea4af20c4517.tar.gz
scala-7d28c4966e5b32b46fda927f303aea4af20c4517.tar.bz2
scala-7d28c4966e5b32b46fda927f303aea4af20c4517.zip
Merge pull request #3216 from xeno-by/topic/macro-error-messages
better error messages for various macro definition errors
Diffstat (limited to 'test/files/neg/macro-invalidret.check')
-rw-r--r--test/files/neg/macro-invalidret.check8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/macro-invalidret.check b/test/files/neg/macro-invalidret.check
index 19adc70fb3..ea003a17ec 100644
--- a/test/files/neg/macro-invalidret.check
+++ b/test/files/neg/macro-invalidret.check
@@ -1,15 +1,15 @@
-Macros_Test_2.scala:2: error: macro implementation has wrong shape:
+Macros_Test_2.scala:2: error: macro implementation has incompatible shape:
required: (c: scala.reflect.macros.BlackboxContext): c.Expr[Any]
or : (c: scala.reflect.macros.BlackboxContext): c.Tree
found : (c: scala.reflect.macros.BlackboxContext): Int
type mismatch for return type: Int does not conform to c.Expr[Any]
def foo1 = macro Impls.foo1
- ^
-Macros_Test_2.scala:3: error: macro implementation has wrong shape:
+ ^
+Macros_Test_2.scala:3: error: macro implementation has incompatible shape:
required: (c: scala.reflect.macros.BlackboxContext): c.Expr[Any]
or : (c: scala.reflect.macros.BlackboxContext): c.Tree
found : (c: scala.reflect.macros.BlackboxContext): reflect.runtime.universe.Literal
type mismatch for return type: reflect.runtime.universe.Literal does not conform to c.Expr[Any]
def foo2 = macro Impls.foo2
- ^
+ ^
two errors found