Merge pull request scala#2843 from xeno-by/topic/kill-introduce-top-level

kills introduceTopLevel

Author: adriaanm

src/compiler/scala/reflect/macros/contexts/Context.scala

@@ -14,7 +14,6 @@ abstract class Context extends scala.reflect.macros.Context
                           with Parsers
                           with Evals
                           with ExprUtils
-                          with Synthetics
                           with Traces {
 
   val universe: Global

src/compiler/scala/reflect/macros/contexts/Synthetics.scala

@@ -57,8 +57,8 @@ trait CompilationUnits { self: Global =>
     // SBT compatibility (SI-6875)
     //
     // imagine we have a file named A.scala, which defines a trait named Foo and a module named Main
-    // Main contains a call to a macro, which calls c.introduceTopLevel to define a mock for Foo
-    // c.introduceTopLevel creates a virtual file Virt35af32.scala, which contains a class named FooMock extending Foo,
+    // Main contains a call to a macro, which calls compileLate to define a mock for Foo
+    // compileLate creates a virtual file Virt35af32.scala, which contains a class named FooMock extending Foo,
     // and macro expansion instantiates FooMock. the stage is now set. let's see what happens next.
     //
     // without this workaround in scalac or without being patched itself, sbt will think that

src/compiler/scala/tools/nsc/CompilationUnits.scala

@@ -37,8 +37,7 @@ trait Context extends Aliases
                  with Typers
                  with Parsers
                  with Evals
-                 with ExprUtils
-                 with Synthetics {
+                 with ExprUtils {
 
   /** The compile-time universe. */
   val universe: Universe