better macro impl shape errors

With the advent of quasiquotes, we allowed both arguments and return types
of macro impls to be c.Tree's (as opposed to traditional c.Expr[T]'s).

This warrants an update of macro def <-> macro impl signature mismatch
errors that include a printout of suggested macro impl signatures. Now
along with a signature that contains exprs, we suggest another signature
that has all exprs replaced by trees

1 files changed, 2 insertions, 0 deletions

diff --git a/test/files/neg/macro-invalidimpl.check b/test/files/neg/macro-invalidimpl.check
index aaf4f88fc2..e39cc8105b 100644
--- a/test/files/neg/macro-invalidimpl.check
+++ b/test/files/neg/macro-invalidimpl.check
@@ -32,12 +32,14 @@ match expected type ?
                                          ^
 Macros_Test_2.scala:31: error: macro implementation has wrong shape:
  required: (c: scala.reflect.macros.Context): c.Expr[Unit]
+ or      : (c: scala.reflect.macros.Context): c.Tree
  found   : (c: scala.reflect.macros.Context)(): c.Expr[Unit]
 number of parameter sections differ
   def foo1 = macro Impls6.fooEmpty
       ^
 Macros_Test_2.scala:32: error: macro implementation has wrong shape:
  required: (c: scala.reflect.macros.Context)(): c.Expr[Unit]
+ or      : (c: scala.reflect.macros.Context)(): c.Tree
  found   : (c: scala.reflect.macros.Context): c.Expr[Unit]
 number of parameter sections differ
   def bar1() = macro Impls6.fooNullary