better error messages for various macro definition errors

1 files changed, 9 insertions, 9 deletions

diff --git a/test/files/neg/macro-invalidimpl.check b/test/files/neg/macro-invalidimpl.check
index 432da4d00b..5eff401bef 100644
--- a/test/files/neg/macro-invalidimpl.check
+++ b/test/files/neg/macro-invalidimpl.check
@@ -2,22 +2,22 @@ Macros_Test_2.scala:5: error: macro implementation reference has wrong shape. re
 macro [<static object>].<method name>[[<type args>]] or
 macro [<macro bundle>].<method name>[[<type args>]]
   def foo(x: Any) = macro impls.foo
-      ^
+                                ^
 Macros_Test_2.scala:10: error: macro implementation reference has wrong shape. required:
 macro [<static object>].<method name>[[<type args>]] or
 macro [<macro bundle>].<method name>[[<type args>]]
   def foo(x: Any) = macro impls.foo
-      ^
+                                ^
 Macros_Test_2.scala:18: error: macro implementation reference has wrong shape. required:
 macro [<static object>].<method name>[[<type args>]] or
 macro [<macro bundle>].<method name>[[<type args>]]
   def foo(x: Any) = macro Impls3.foo
-      ^
+                                 ^
 Macros_Test_2.scala:22: error: macro implementation reference has wrong shape. required:
 macro [<static object>].<method name>[[<type args>]] or
 macro [<macro bundle>].<method name>[[<type args>]]
   def foo(x: Any) = macro Impls4.foo
-      ^
+                                 ^
 Macros_Test_2.scala:26: error: ambiguous reference to overloaded definition,
 both method foo in object Impls5 of type (c: scala.reflect.macros.BlackboxContext)(x: c.Expr[Any], y: c.Expr[Any])Nothing
 and  method foo in object Impls5 of type (c: scala.reflect.macros.BlackboxContext)(x: c.Expr[Any])Nothing
@@ -30,24 +30,24 @@ and  method foo in object Impls5 of type (c: scala.reflect.macros.BlackboxContex
 match expected type ?
   def foo(x: Any, y: Any) = macro Impls5.foo
                                          ^
-Macros_Test_2.scala:31: error: macro implementation has wrong shape:
+Macros_Test_2.scala:31: error: macro implementation has incompatible shape:
  required: (c: scala.reflect.macros.BlackboxContext): c.Expr[Unit]
  or      : (c: scala.reflect.macros.BlackboxContext): c.Tree
  found   : (c: scala.reflect.macros.BlackboxContext)(): c.Expr[Unit]
 number of parameter sections differ
   def foo1 = macro Impls6.fooEmpty
-      ^
-Macros_Test_2.scala:32: error: macro implementation has wrong shape:
+                          ^
+Macros_Test_2.scala:32: error: macro implementation has incompatible shape:
  required: (c: scala.reflect.macros.BlackboxContext)(): c.Expr[Unit]
  or      : (c: scala.reflect.macros.BlackboxContext)(): c.Tree
  found   : (c: scala.reflect.macros.BlackboxContext): c.Expr[Unit]
 number of parameter sections differ
   def bar1() = macro Impls6.fooNullary
-      ^
+                            ^
 Macros_Test_2.scala:36: error: type arguments [String] do not conform to method foo's type parameter bounds [U <: Int]
   def foo = macro Impls7.foo[String]
                             ^
 Macros_Test_2.scala:53: error: macro implementation must be public
     def foo = macro Impls8.impl
-        ^
+                           ^
 10 errors found