Merge pull request #754 from scalamacros/topic/removereflectcompat

removes pre-M4 compatibility stubs for the IDE

3 files changed, 2 insertions, 35 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