summaryrefslogtreecommitdiff
path: root/test/files/neg/t5753
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
commitef4c5d2f43e912b5562c1372228e9c6ec9f25bb0 (patch)
treebb7385f1971d1b7869eed8678fb0bfef24082e60 /test/files/neg/t5753
parent4065b5136f2d0d1b6b9bb03f6669c1fd8a2b4e64 (diff)
parentb2f67b5730adccc4cbb24e5b542dc66452869489 (diff)
downloadscala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.gz
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.bz2
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.zip
Merge pull request #3355 from xeno-by/topic/saturday-night
reshuffles names for blackbox/whitebox contexts, changes bundle notation
Diffstat (limited to 'test/files/neg/t5753')
-rw-r--r--test/files/neg/t5753/Impls_Macros_1.scala4
-rw-r--r--test/files/neg/t5753/Test_2.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t5753/Impls_Macros_1.scala b/test/files/neg/t5753/Impls_Macros_1.scala
index 0e81e21c77..9872c69171 100644
--- a/test/files/neg/t5753/Impls_Macros_1.scala
+++ b/test/files/neg/t5753/Impls_Macros_1.scala
@@ -1,6 +1,6 @@
-import scala.reflect.macros.{BlackboxContext => Ctx}
+import scala.reflect.macros.blackbox.Context
trait Impls {
- def impl(c: Ctx)(x: c.Expr[Any]) = x
+ def impl(c: Context)(x: c.Expr[Any]) = x
}
diff --git a/test/files/neg/t5753/Test_2.scala b/test/files/neg/t5753/Test_2.scala
index 150850a0eb..d52ed65c60 100644
--- a/test/files/neg/t5753/Test_2.scala
+++ b/test/files/neg/t5753/Test_2.scala
@@ -1,4 +1,4 @@
-import scala.reflect.macros.{BlackboxContext => Ctx}
+import scala.reflect.macros.blackbox.Context
object Macros extends Impls {
def foo(x: Any): Any = macro impl