*boxContext => *box.Context , *boxMacro => *box.Macro

Performs the following renamings:
* scala.reflect.macros.BlackboxContext to scala.reflect.macros.blackbox.Context
* scala.reflect.macros.BlackboxMacro to scala.reflect.macros.blackbox.Macro
* scala.reflect.macros.WhiteboxContext to scala.reflect.macros.whitebox.Context
* scala.reflect.macros.WhiteboxMacro to scala.reflect.macros.whitebox.Macro

https://groups.google.com/forum/#!topic/scala-internals/MX40-dM28rk

2 files changed, 12 insertions, 12 deletions

diff --git a/test/files/neg/macro-invalidimpl/Impls_1.scala b/test/files/neg/macro-invalidimpl/Impls_1.scala
index b85ac9ee43..a1c885a4bf 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.BlackboxContext
+import scala.reflect.macros.blackbox.Context
 
 class Impls1 {
-  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
+  def foo(c: Context)(x: c.Expr[Any]) = ???
 }
 
 object Impls2 {
-  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
+  def foo(c: Context)(x: c.Expr[Any]) = ???
 }
 
 trait MacroHelpers {
   object Impls4 {
-    def foo(c: BlackboxContext)(x: c.Expr[Any]) = x
+    def foo(c: Context)(x: c.Expr[Any]) = x
   }
 }
 
 object Impls5 {
-  def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
-  def foo(c: BlackboxContext)(x: c.Expr[Any], y: c.Expr[Any]) = ???
+  def foo(c: Context)(x: c.Expr[Any]) = ???
+  def foo(c: Context)(x: c.Expr[Any], y: c.Expr[Any]) = ???
 }
 
 object Impls6 {
-  def fooNullary(c: BlackboxContext) = {
+  def fooNullary(c: Context) = {
     import c.universe._
     c.Expr[Unit](q"""Predef.println("it works")""")
   }
 
-  def fooEmpty(c: BlackboxContext)() = fooNullary(c)
+  def fooEmpty(c: Context)() = fooNullary(c)
 }
 
 object Impls7 {
-  def foo[U <: Int](c: BlackboxContext) = ???
+  def foo[U <: Int](c: Context) = ???
 }
 
 package foo {
   object Impls8 {
-    private[foo] def impl(c: BlackboxContext) = ???
+    private[foo] def impl(c: Context) = ???
   }
 }
\ No newline at end of file
diff --git a/test/files/neg/macro-invalidimpl/Macros_Test_2.scala b/test/files/neg/macro-invalidimpl/Macros_Test_2.scala
index 0df7d2e0c5..6760d99959 100644
--- a/test/files/neg/macro-invalidimpl/Macros_Test_2.scala
+++ b/test/files/neg/macro-invalidimpl/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-import scala.reflect.macros.BlackboxContext
+import scala.reflect.macros.blackbox.Context
 
 object Macros1 {
   val impls = new Impls1
@@ -12,7 +12,7 @@ object Macros2 {
 
 class Macros3 {
   object Impls3 {
-    def foo(c: BlackboxContext)(x: c.Expr[Any]) = ???
+    def foo(c: Context)(x: c.Expr[Any]) = ???
   }
 
   def foo(x: Any) = macro Impls3.foo