From 43f7a86e931045c30575e4f0e5a6cd542dc0a380 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 21 Apr 2016 20:31:04 +0200 Subject: remove recursive classpath implementation --- src/compiler/scala/tools/nsc/ScriptRunner.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/compiler/scala/tools/nsc/ScriptRunner.scala') diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index bf93ad30bc..fed335daef 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -11,7 +11,6 @@ import java.io.IOException import scala.tools.nsc.classpath.DirectoryFlatClassPath import scala.tools.nsc.reporters.{Reporter,ConsoleReporter} import scala.tools.nsc.settings.ClassPathRepresentationType -import scala.tools.nsc.util.ClassPath.DefaultJavaContext import util.Exceptional.unwrap /** An object that runs Scala code in script files. @@ -115,10 +114,7 @@ class ScriptRunner extends HasCompileSocket { } def hasClassToRun(d: Directory): Boolean = { - val cp = settings.YclasspathImpl.value match { - case ClassPathRepresentationType.Recursive => DefaultJavaContext.newClassPath(AbstractFile.getDirectory(d)) - case ClassPathRepresentationType.Flat => DirectoryFlatClassPath(d.jfile) - } + val cp = DirectoryFlatClassPath(d.jfile) cp.findClass(mainClass).isDefined } -- cgit v1.2.3