Merge pull request #3129 from adriaanm/pr-rebase-3001

[rebase] blackbox and whitebox macros

1 files changed, 10 insertions, 10 deletions

diff --git a/test/files/neg/macro-invalidimpl/Impls_1.scala b/test/files/neg/macro-invalidimpl/Impls_1.scala
index 9f48ab7ad9..b85ac9ee43 100644
--- a/test/files/neg/macro-invalidimpl/Impls_1.scala
+++ b/test/files/neg/macro-invalidimpl/Impls_1.scala
@@ -1,39 +1,39 @@
-import scala.reflect.macros.Context
+import scala.reflect.macros.BlackboxContext
 
 class Impls1 {
-  def foo(c: Context)(x: c.Expr[Any]) = ???
+  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
 }
 
 object Impls2 {
-  def foo(c: Context)(x: c.Expr[Any]) = ???
+  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
 }
 
 trait MacroHelpers {
   object Impls4 {
-    def foo(c: Context)(x: c.Expr[Any]) = x
+    def foo(c: BlackboxContext)(x: c.Expr[Any]) = x
   }
 }
 
 object Impls5 {
-  def foo(c: Context)(x: c.Expr[Any]) = ???
-  def foo(c: Context)(x: c.Expr[Any], y: c.Expr[Any]) = ???
+  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
+  def foo(c: BlackboxContext)(x: c.Expr[Any], y: c.Expr[Any]) = ???
 }
 
 object Impls6 {
-  def fooNullary(c: Context) = {
+  def fooNullary(c: BlackboxContext) = {
     import c.universe._
     c.Expr[Unit](q"""Predef.println("it works")""")
   }
 
-  def fooEmpty(c: Context)() = fooNullary(c)
+  def fooEmpty(c: BlackboxContext)() = fooNullary(c)
 }
 
 object Impls7 {
-  def foo[U <: Int](c: Context) = ???
+  def foo[U <: Int](c: BlackboxContext) = ???
 }
 
 package foo {
   object Impls8 {
-    private[foo] def impl(c: Context) = ???
+    private[foo] def impl(c: BlackboxContext) = ???
   }
 }
\ No newline at end of file