changes bundles to be classes, not traits extending Macro

Adjusts bundle notation to read `class Bundle(val c: Context)` instead of
`class Bundle extends Macro`. This avoids calling compileLate in the
macro compiler and associated tooling problems.

2 files changed, 5 insertions, 5 deletions

diff --git a/test/files/run/macro-bundle-static/Impls_Macros_1.scala b/test/files/run/macro-bundle-static/Impls_Macros_1.scala
index 34328edcd8..0142e5d945 100644
--- a/test/files/run/macro-bundle-static/Impls_Macros_1.scala
+++ b/test/files/run/macro-bundle-static/Impls_Macros_1.scala
@@ -1,8 +1,8 @@
-import scala.reflect.macros.blackbox.Macro
+import scala.reflect.macros.blackbox.Context
 import scala.language.experimental.macros
 
 object Enclosing {
-  trait Impl extends Macro {
+  class Impl(val c: Context) {
     def mono = { import c.universe._; c.Expr[Unit](q"()") }
     def poly[T: c.WeakTypeTag] = { import c.universe._; c.Expr[String](q"${c.weakTypeOf[T].toString}") }
     def weird = macro mono
@@ -16,7 +16,7 @@ object Macros {
 
 package pkg {
   object Enclosing {
-    trait Impl extends Macro {
+    class Impl(val c: Context) {
       def mono = { import c.universe._; c.Expr[Boolean](q"true") }
       def poly[T: c.WeakTypeTag] = { import c.universe._; c.Expr[String](q"${c.weakTypeOf[T].toString + c.weakTypeOf[T].toString}") }
       def weird = macro mono
diff --git a/test/files/run/macro-bundle-static/Test_2.scala b/test/files/run/macro-bundle-static/Test_2.scala
index 72160f6ec2..e35260cdce 100644
--- a/test/files/run/macro-bundle-static/Test_2.scala
+++ b/test/files/run/macro-bundle-static/Test_2.scala
@@ -1,8 +1,8 @@
 object Test extends App {
   println(Macros.mono)
   println(Macros.poly[Int])
-  println(new Enclosing.Impl{val c = ???}.weird)
+  println(new Enclosing.Impl(???).weird)
   println(pkg.Macros.mono)
   println(pkg.Macros.poly[Int])
-  println(new pkg.Enclosing.Impl{val c = ???}.weird)
+  println(new pkg.Enclosing.Impl(???).weird)
 }
\ No newline at end of file