SI-7681 Remove scala.tools.nsc.io.DaemonThreadFactory

3 files changed, 3 insertions, 40 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
-  }
 }
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
index 3a71930383..5bfad7a159 100644
--- a/src/repl/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -26,7 +26,7 @@ import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine
 import java.io.{ StringWriter, Reader }
 import java.util.Arrays
 import IMain._
-import java.util.concurrent.Future
+import scala.concurrent.{ Future, ExecutionContext }
 import scala.reflect.runtime.{ universe => ru }
 import scala.reflect.{ ClassTag, classTag }
 import StdReplTags._
@@ -142,10 +142,8 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set
   def initialize(postInitSignal: => Unit) {
     synchronized {
       if (_isInitialized == null) {
-        _isInitialized = io.spawn {
-          try _initialize()
-          finally postInitSignal
-        }
+        _isInitialized =
+          Future(try _initialize() finally postInitSignal)(ExecutionContext.global)
       }
     }
   }