From 30d6fce50aba1d73173339b0add4808bc13b1c40 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Mon, 25 Apr 2016 21:26:17 +0200 Subject: Remove abstraction layer in classpath implementation --- src/compiler/scala/tools/nsc/ScriptRunner.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 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 fed335daef..1f66657d8d 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -8,9 +8,8 @@ package tools.nsc import io.{ AbstractFile, Directory, File, Path } import java.io.IOException -import scala.tools.nsc.classpath.DirectoryFlatClassPath +import scala.tools.nsc.classpath.DirectoryClassPath import scala.tools.nsc.reporters.{Reporter,ConsoleReporter} -import scala.tools.nsc.settings.ClassPathRepresentationType import util.Exceptional.unwrap /** An object that runs Scala code in script files. @@ -114,7 +113,7 @@ class ScriptRunner extends HasCompileSocket { } def hasClassToRun(d: Directory): Boolean = { - val cp = DirectoryFlatClassPath(d.jfile) + val cp = DirectoryClassPath(d.jfile) cp.findClass(mainClass).isDefined } -- cgit v1.2.3