diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/concurrent/default/SchedulerImpl.scala.disabled (renamed from src/library/scala/concurrent/default/SchedulerImpl.scala) | 0 | ||||
-rw-r--r-- | src/library/scala/concurrent/default/TaskImpl.scala.disabled (renamed from src/library/scala/concurrent/default/TaskImpl.scala) | 0 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/AbstractPromise.java (renamed from src/library/scala/concurrent/akka/AbstractPromise.java) | 2 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/ExecutionContextImpl.scala (renamed from src/library/scala/concurrent/akka/ExecutionContextImpl.scala) | 4 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/Future.scala (renamed from src/library/scala/concurrent/akka/Future.scala) | 2 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/Promise.scala (renamed from src/library/scala/concurrent/akka/Promise.scala) | 3 | ||||
-rw-r--r-- | src/library/scala/concurrent/impl/package.scala (renamed from src/library/scala/concurrent/akka/package.scala) | 2 | ||||
-rw-r--r-- | src/library/scala/concurrent/package.scala | 6 |
8 files changed, 10 insertions, 9 deletions
diff --git a/src/library/scala/concurrent/default/SchedulerImpl.scala b/src/library/scala/concurrent/default/SchedulerImpl.scala.disabled index 745d2d1a15..745d2d1a15 100644 --- a/src/library/scala/concurrent/default/SchedulerImpl.scala +++ b/src/library/scala/concurrent/default/SchedulerImpl.scala.disabled diff --git a/src/library/scala/concurrent/default/TaskImpl.scala b/src/library/scala/concurrent/default/TaskImpl.scala.disabled index 94e54cb372..94e54cb372 100644 --- a/src/library/scala/concurrent/default/TaskImpl.scala +++ b/src/library/scala/concurrent/default/TaskImpl.scala.disabled diff --git a/src/library/scala/concurrent/akka/AbstractPromise.java b/src/library/scala/concurrent/impl/AbstractPromise.java index 38c74edf2f..5280d67854 100644 --- a/src/library/scala/concurrent/akka/AbstractPromise.java +++ b/src/library/scala/concurrent/impl/AbstractPromise.java @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.concurrent.akka; +package scala.concurrent.impl; diff --git a/src/library/scala/concurrent/akka/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala index 2bc846ba3c..af0eb66292 100644 --- a/src/library/scala/concurrent/akka/ExecutionContextImpl.scala +++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.concurrent.akka +package scala.concurrent.impl @@ -93,7 +93,7 @@ class ExecutionContextImpl(executorService: ExecutorService) extends ExecutionCo _taskStack.remove() } - private[akka] def dispatchFuture(task: () => Unit, force: Boolean = false): Unit = + private[impl] def dispatchFuture(task: () => Unit, force: Boolean = false): Unit = _taskStack.get match { case stack if (stack ne null) && !force => stack push task case _ => this.execute( diff --git a/src/library/scala/concurrent/akka/Future.scala b/src/library/scala/concurrent/impl/Future.scala index 2633e751bd..3664241ec0 100644 --- a/src/library/scala/concurrent/akka/Future.scala +++ b/src/library/scala/concurrent/impl/Future.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.concurrent.akka +package scala.concurrent.impl diff --git a/src/library/scala/concurrent/akka/Promise.scala b/src/library/scala/concurrent/impl/Promise.scala index 8ecffec2aa..3f9970b178 100644 --- a/src/library/scala/concurrent/akka/Promise.scala +++ b/src/library/scala/concurrent/impl/Promise.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.concurrent.akka +package scala.concurrent.impl @@ -21,6 +21,7 @@ import scala.annotation.tailrec //import scala.concurrent.NonDeterministic + trait Promise[T] extends scala.concurrent.Promise[T] with Future[T] { def future = this diff --git a/src/library/scala/concurrent/akka/package.scala b/src/library/scala/concurrent/impl/package.scala index 8c059b8e71..72add73167 100644 --- a/src/library/scala/concurrent/akka/package.scala +++ b/src/library/scala/concurrent/impl/package.scala @@ -15,7 +15,7 @@ import scala.util.Duration -package object akka { +package object impl { private val toBoxed = Map[Class[_], Class[_]]( classOf[Boolean] -> classOf[jl.Boolean], diff --git a/src/library/scala/concurrent/package.scala b/src/library/scala/concurrent/package.scala index 35b8cf6664..0725332c5e 100644 --- a/src/library/scala/concurrent/package.scala +++ b/src/library/scala/concurrent/package.scala @@ -25,12 +25,12 @@ package object concurrent { /** A global execution environment for executing lightweight tasks. */ lazy val executionContext = - new akka.ExecutionContextImpl(java.util.concurrent.Executors.newCachedThreadPool()) + new impl.ExecutionContextImpl(java.util.concurrent.Executors.newCachedThreadPool()) /** A global service for scheduling tasks for execution. */ - lazy val scheduler = - new default.SchedulerImpl + // lazy val scheduler = + // new default.SchedulerImpl val handledFutureException: PartialFunction[Throwable, Throwable] = { case t: Throwable if isFutureThrowable(t) => t |