diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:47:25 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:47:25 -0700 |
commit | 693b932023fea433696fc9518a0fa7d56514d12e (patch) | |
tree | c720d7d17f578906aba1f45aa8d7fc4484f47ca2 /src/compiler | |
parent | 63bce12e94eb4480823627d6328f74befa421bbf (diff) | |
parent | ee6e25e2f70747795b42b2d5bce8ac94a95cc948 (diff) | |
download | scala-693b932023fea433696fc9518a0fa7d56514d12e.tar.gz scala-693b932023fea433696fc9518a0fa7d56514d12e.tar.bz2 scala-693b932023fea433696fc9518a0fa7d56514d12e.zip |
Merge pull request #2777 from soc/SI-7681-dead-code-daemonthreadfactory
SI-7681 Remove DaemonThreadFactory, clean up IMain
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/io/DaemonThreadFactory.scala | 21 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/io/package.scala | 14 |
2 files changed, 0 insertions, 35 deletions
diff --git a/src/compiler/scala/tools/nsc/io/DaemonThreadFactory.scala b/src/compiler/scala/tools/nsc/io/DaemonThreadFactory.scala deleted file mode 100644 index 98c3d27202..0000000000 --- a/src/compiler/scala/tools/nsc/io/DaemonThreadFactory.scala +++ /dev/null @@ -1,21 +0,0 @@ -/* NSC -- new Scala compiler - * Copyright 2005-2013 LAMP/EPFL - * @author Paul Phillips - */ - -package scala.tools.nsc -package io - -import java.util.concurrent._ - -class DaemonThreadFactory extends ThreadFactory { - def newThread(r: Runnable): Thread = { - val thread = new Thread(r) - thread setDaemon true - thread - } -} - -object DaemonThreadFactory { - def newPool() = Executors.newCachedThreadPool(new DaemonThreadFactory) -}
\ No newline at end of file diff --git a/src/compiler/scala/tools/nsc/io/package.scala b/src/compiler/scala/tools/nsc/io/package.scala index 0b2db115fb..5f2f90c284 100644 --- a/src/compiler/scala/tools/nsc/io/package.scala +++ b/src/compiler/scala/tools/nsc/io/package.scala @@ -5,8 +5,6 @@ package scala.tools.nsc -import java.util.concurrent.{ Future, Callable } -import java.util.{ Timer, TimerTask } import scala.language.implicitConversions package object io { @@ -29,16 +27,4 @@ package object io { type JFile = java.io.File implicit def enrichManifest(m: JManifest): Jar.WManifest = Jar.WManifest(m) - private lazy val daemonThreadPool = DaemonThreadFactory.newPool() - - def runnable(body: => Unit): Runnable = new Runnable { override def run() = body } - def callable[T](body: => T): Callable[T] = new Callable[T] { override def call() = body } - def spawn[T](body: => T): Future[T] = daemonThreadPool submit callable(body) - - def newThread(f: Thread => Unit)(body: => Unit): Thread = { - val thread = new Thread(runnable(body)) - f(thread) - thread.start - thread - } } |