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

reshuffles names for blackbox/whitebox contexts, changes bundle notation

1 files changed, 6 insertions, 6 deletions

diff --git a/test/files/neg/macro-invalidret/Impls_1.scala b/test/files/neg/macro-invalidret/Impls_1.scala
index b32463899e..434aeef10f 100644
--- a/test/files/neg/macro-invalidret/Impls_1.scala
+++ b/test/files/neg/macro-invalidret/Impls_1.scala
@@ -1,10 +1,10 @@
-import scala.reflect.macros.BlackboxContext
+import scala.reflect.macros.blackbox.Context
 import scala.reflect.runtime.{universe => ru}
 
 object Impls {
-  def foo1(c: BlackboxContext) = 2
-  def foo2(c: BlackboxContext) = ru.Literal(ru.Constant(42))
-  def foo3(c: BlackboxContext) = ???
-  def foo5(c: BlackboxContext) = c.universe.Literal(c.universe.Constant(42))
-  def foo6(c: BlackboxContext) = c.Expr[Int](c.universe.Literal(c.universe.Constant(42)))
+  def foo1(c: Context) = 2
+  def foo2(c: Context) = ru.Literal(ru.Constant(42))
+  def foo3(c: Context) = ???
+  def foo5(c: Context) = c.universe.Literal(c.universe.Constant(42))
+  def foo6(c: Context) = c.Expr[Int](c.universe.Literal(c.universe.Constant(42)))
 }