Merge pull request #3355 from xeno-by/topic/saturday-night

reshuffles names for blackbox/whitebox contexts, changes bundle notation

1 files changed, 4 insertions, 4 deletions

diff --git a/test/files/neg/macro-without-xmacros-b/Impls_1.scala b/test/files/neg/macro-without-xmacros-b/Impls_1.scala
index 6b73a96184..035913f3e3 100644
--- a/test/files/neg/macro-without-xmacros-b/Impls_1.scala
+++ b/test/files/neg/macro-without-xmacros-b/Impls_1.scala
@@ -1,17 +1,17 @@
-import scala.reflect.macros.{BlackboxContext => Ctx}
+import scala.reflect.macros.blackbox.Context
 
 object Impls {
-  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+  def foo_impl(c: Context)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.universe._
     c.Expr(q"$x + 1")
   }
 
-  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+  def bar_impl(c: Context)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.universe._
     c.Expr(q"$x + 2")
   }
 
-  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+  def quux_impl(c: Context)(x: c.Expr[Int]): c.Expr[Int] = {
     import c.universe._
     c.Expr(q"$x + 3")
   }