diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-27 07:22:21 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-27 07:22:21 -0700 |
| commit | 8cc3f6cc7a729f1aa079a63809048f864b57bd4c (patch) | |
| tree | 8c5570436bd86a766de89e459cda43e3e6322959 /test/files | |
| parent | 83337eea13d373a4c38c4c1a763d540a62d31729 (diff) | |
| parent | 78ef5406ca01e65432df83a4b6bbd6dfef55376a (diff) | |
| download | scala-8cc3f6cc7a729f1aa079a63809048f864b57bd4c.tar.gz scala-8cc3f6cc7a729f1aa079a63809048f864b57bd4c.tar.bz2 scala-8cc3f6cc7a729f1aa079a63809048f864b57bd4c.zip | |
Merge pull request #754 from scalamacros/topic/removereflectcompat
removes pre-M4 compatibility stubs for the IDE
Diffstat (limited to 'test/files')
3 files changed, 3 insertions, 4 deletions
diff --git a/test/files/neg/macro-invalidret-nonuniversetree.check b/test/files/neg/macro-invalidret-nonuniversetree.check index 4fc06b5ceb..1b9487982f 100644 --- a/test/files/neg/macro-invalidret-nonuniversetree.check +++ b/test/files/neg/macro-invalidret-nonuniversetree.check @@ -1,7 +1,7 @@ Macros_Test_2.scala:2: error: macro implementation has wrong shape:
required: (c: scala.reflect.makro.Context): c.Expr[Any]
- found : (c: scala.reflect.makro.Context): reflect.mirror.Literal
-type mismatch for return type: reflect.mirror.Literal does not conform to c.Expr[Any]
+ found : (c: scala.reflect.makro.Context): reflect.basis.Literal
+type mismatch for return type: reflect.basis.Literal does not conform to c.Expr[Any]
def foo = macro Impls.foo
^
one error found
diff --git a/test/files/neg/macro-invalidret-nonuniversetree/Impls_1.scala b/test/files/neg/macro-invalidret-nonuniversetree/Impls_1.scala index 86b7c8d8d0..da0eb0ac83 100644 --- a/test/files/neg/macro-invalidret-nonuniversetree/Impls_1.scala +++ b/test/files/neg/macro-invalidret-nonuniversetree/Impls_1.scala @@ -1,5 +1,5 @@ import scala.reflect.makro.{Context => Ctx} object Impls { - def foo(c: Ctx) = scala.reflect.mirror.Literal(scala.reflect.mirror.Constant(42)) + def foo(c: Ctx) = scala.reflect.basis.Literal(scala.reflect.basis.Constant(42)) } diff --git a/test/files/run/macro-reify-splice-splice/Macros_1.scala b/test/files/run/macro-reify-splice-splice/Macros_1.scala index 030a0a217e..4f1b600f63 100644 --- a/test/files/run/macro-reify-splice-splice/Macros_1.scala +++ b/test/files/run/macro-reify-splice-splice/Macros_1.scala @@ -1,5 +1,4 @@ import scala.reflect.makro.{Context => Ctx} -import scala.reflect.{mirror => mr} object Macros { def foo = macro Impls.foo |