diff options
| author | Paul Phillips <paulp@improving.org> | 2011-05-21 17:45:31 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-05-21 17:45:31 +0000 |
| commit | 390f2d52aef0785f745a52121685b0ef2e0699c4 (patch) | |
| tree | c5d5617a8fb0c1d1e6855d8d600beedfa349c03c | |
| parent | b4b884e0f878c2da1f410d51977d36dacfcab536 (diff) | |
| download | scala-390f2d52aef0785f745a52121685b0ef2e0699c4.tar.gz scala-390f2d52aef0785f745a52121685b0ef2e0699c4.tar.bz2 scala-390f2d52aef0785f745a52121685b0ef2e0699c4.zip | |
Cleanup in scriptrunner, no review.
| -rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 96b7bce885..3ec5b2f044 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -5,18 +5,9 @@ package scala.tools.nsc -import java.io.{ - InputStream, OutputStream, - BufferedReader, FileInputStream, FileOutputStream, - FileReader, InputStreamReader, PrintWriter, FileWriter, - IOException -} -import io.{ Directory, File, Path, PlainFile } +import io.{ Directory, File, Path } +import java.io.IOException import java.net.URL -import java.util.jar.{ JarEntry, JarOutputStream } - -import util.{ waitingForThreads } -import scala.tools.util.PathResolver import scala.tools.nsc.reporters.{Reporter,ConsoleReporter} import util.Exceptional.unwrap @@ -136,7 +127,7 @@ class ScriptRunner extends HasCompileSocket { /** The script runner calls sys.exit to communicate a return value, but this must * not take place until there are no non-daemon threads running. Tickets #1955, #2006. */ - waitingForThreads { + util.waitingForThreads { if (settings.save.value) { val jarFile = jarFileFor(scriptFile) def jarOK = jarFile.canRead && (jarFile isFresher File(scriptFile)) |