removes pre-M4 compatibility stubs for the IDE

6 files changed, 5 insertions, 39 deletions

diff --git a/src/library/scala/reflect/compat.scala b/src/library/scala/reflect/compat.scala
deleted file mode 100644
index fc0e5fbf9c..0000000000
--- a/src/library/scala/reflect/compat.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-// [Eugene++] delete this once we merge with trunk and have a working IDE
-
-package scala.reflect {
-  trait ArrayTag[T]
-  trait ErasureTag[T]
-  trait ConcreteTypeTag[T]
-}
-
-package scala.reflect.api {
-  trait TypeTags {
-    trait TypeTag[T]
-    trait ConcreteTypeTag[T]
-  }
-}
-
-package scala {
-  import scala.reflect.base.{Universe => BaseUniverse}
-
-  trait reflect_compat {
-    lazy val mirror: BaseUniverse = ???
-  }
-}
-
-package scala.reflect {
-  import language.experimental.macros
-  import scala.reflect.base.{Universe => BaseUniverse}
-
-  trait internal_compat {
-    private[scala] def materializeArrayTag[T](u: BaseUniverse): ArrayTag[T] = ???
-    private[scala] def materializeErasureTag[T](u: BaseUniverse): ErasureTag[T] = ???
-    private[scala] def materializeConcreteTypeTag[T](u: BaseUniverse): ConcreteTypeTag[T] = ???
-  }
-}
\ No newline at end of file
diff --git a/src/library/scala/reflect/makro/internal/package.scala b/src/library/scala/reflect/makro/internal/package.scala
index d31a0f0d14..78cb0ffb10 100644
--- a/src/library/scala/reflect/makro/internal/package.scala
+++ b/src/library/scala/reflect/makro/internal/package.scala
@@ -9,7 +9,7 @@ import scala.reflect.base.{Universe => BaseUniverse}
 //
 // todo. once we have implicit macros for tag generation, we can remove these anchors
 // [Eugene++] how do I hide this from scaladoc?
-package object internal extends scala.reflect.internal_compat {
+package object internal {
   private[scala] def materializeClassTag[T](u: BaseUniverse): ClassTag[T] = macro ???
   private[scala] def materializeAbsTypeTag[T](u: BaseUniverse): u.AbsTypeTag[T] = macro ???
   private[scala] def materializeTypeTag[T](u: BaseUniverse): u.TypeTag[T] = macro ???
diff --git a/src/library/scala/reflect/package.scala b/src/library/scala/reflect/package.scala
index 0ee58df2cd..2ebc82875e 100644
--- a/src/library/scala/reflect/package.scala
+++ b/src/library/scala/reflect/package.scala
@@ -1,6 +1,6 @@
 package scala
 
-package object reflect extends reflect_compat {
+package object reflect {
 
   lazy val basis: base.Universe = new base.Base
 
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