summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ScriptRunner.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-04-21 20:31:04 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-04-23 12:46:48 +0200
commit43f7a86e931045c30575e4f0e5a6cd542dc0a380 (patch)
treec4fa310c4538f08e30dbd0b47a44663f2a9c59b5 /src/compiler/scala/tools/nsc/ScriptRunner.scala
parentf55dd2084eca97c576a982473ab6701f98fb79a7 (diff)
downloadscala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.tar.gz
scala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.tar.bz2
scala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.zip
remove recursive classpath implementation
Diffstat (limited to 'src/compiler/scala/tools/nsc/ScriptRunner.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ScriptRunner.scala6
1 files changed, 1 insertions, 5 deletions
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
}