1 files changed, 6 insertions, 26 deletions
diff --git a/src/compiler/scala/reflect/macros/runtime/Infrastructure.scala b/src/compiler/scala/reflect/macros/runtime/Infrastructure.scala
index a8cc61e0f9..7781693822 100644
--- a/src/compiler/scala/reflect/macros/runtime/Infrastructure.scala
+++ b/src/compiler/scala/reflect/macros/runtime/Infrastructure.scala
@@ -1,36 +1,16 @@
 package scala.reflect.macros
 package runtime
 
-import scala.tools.nsc.util.ScalaClassLoader
-
 trait Infrastructure {
   self: Context =>
 
-  val forJVM: Boolean = universe.forJVM
-
-  val forMSIL: Boolean = universe.forMSIL
-
-  val forInteractive: Boolean = universe.forInteractive
-
-  val forScaladoc: Boolean = universe.forScaladoc
-
-  val currentRun: Run = universe.currentRun
-
-  val libraryClassPath: List[java.net.URL] = universe.classPath.asURLs
-
-  lazy val libraryClassLoader: ClassLoader = universe.analyzer.macroClassloader
-
-  type Run = universe.Run
-
-  object Run extends RunExtractor {
-    def unapply(run: Run): Option[(CompilationUnit, List[CompilationUnit])] = Some(run.currentUnit, run.units.toList)
+  def settings: List[String] = {
+    val us = universe.settings
+    import us._
+    userSetSettings collectFirst { case x: MultiStringSetting if x.name == XmacroSettings.name => x.value } getOrElse Nil
   }
 
-  type CompilationUnit = universe.CompilationUnit
-
-  object CompilationUnit extends CompilationUnitExtractor {
-    def unapply(compilationUnit: CompilationUnit): Option[(java.io.File, Array[Char], Tree)] = Some(compilationUnit.source.file.file, compilationUnit.source.content, compilationUnit.body)
-  }
+  def compilerSettings: List[String] = universe.settings.recreateArgs
 
-  val currentMacro: Symbol = expandee.symbol
+  def classPath: List[java.net.URL] = global.classPath.asURLs
 }