diff options
-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 | ||||
-rw-r--r-- | test/disabled/jvm/scala-concurrent-tck-akka.scala (renamed from test/files/jvm/scala-concurrent-tck-akka.scala) | 0 | ||||
-rw-r--r-- | test/files/jvm/concurrent-future.scala | 14 | ||||
-rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 23 | ||||
-rw-r--r-- | test/files/pos/Transactions.scala | 2 |
12 files changed, 30 insertions, 28 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 diff --git a/test/files/jvm/scala-concurrent-tck-akka.scala b/test/disabled/jvm/scala-concurrent-tck-akka.scala index dfd906e59e..dfd906e59e 100644 --- a/test/files/jvm/scala-concurrent-tck-akka.scala +++ b/test/disabled/jvm/scala-concurrent-tck-akka.scala diff --git a/test/files/jvm/concurrent-future.scala b/test/files/jvm/concurrent-future.scala index eb3bbad591..b44d054219 100644 --- a/test/files/jvm/concurrent-future.scala +++ b/test/files/jvm/concurrent-future.scala @@ -22,7 +22,7 @@ object Test extends App { val f = future { output(1, "hai world") } - f onSuccess { _ => + f onSuccess { case _ => output(1, "kthxbye") done() } @@ -33,9 +33,9 @@ object Test extends App { val f = future { output(2, "hai world") } - f onSuccess { _ => + f onSuccess { case _ => output(2, "awsum thx") - f onSuccess { _ => + f onSuccess { case _ => output(2, "kthxbye") done() } @@ -49,7 +49,7 @@ object Test extends App { done() throw new Exception } - f onSuccess { _ => + f onSuccess { case _ => output(3, "onoes") } } @@ -60,7 +60,7 @@ object Test extends App { output(4, "hai world") throw new Exception } - f onSuccess { _ => + f onSuccess { case _ => output(4, "onoes") done() } @@ -76,7 +76,7 @@ object Test extends App { output(num, "hai world") throw cause } - f onSuccess { _ => + f onSuccess { case _ => output(num, "onoes") done() } @@ -96,7 +96,7 @@ object Test extends App { output(8, "hai world") throw new FutureTimeoutException(null) } - f onSuccess { _ => + f onSuccess { case _ => output(8, "onoes") done() } diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index a951c09da2..244ff02da7 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -11,6 +11,7 @@ import scala.concurrent.{ import scala.concurrent.future import scala.concurrent.promise import scala.concurrent.blocking +import scala.util.{ Try, Success, Failure } import scala.util.Duration @@ -23,13 +24,13 @@ trait TestBase { sv.take() } - def assert(cond: => Boolean) { - try { - Predef.assert(cond) - } catch { - case e => e.printStackTrace() - } - } + // def assert(cond: => Boolean) { + // try { + // Predef.assert(cond) + // } catch { + // case e => e.printStackTrace() + // } + // } } @@ -264,10 +265,10 @@ trait FutureProjections extends TestBase { throw cause } f.failed onComplete { - case Right(t) => + case Success(t) => assert(t == cause) done() - case Left(t) => + case Failure(t) => assert(false) } } @@ -289,9 +290,9 @@ trait FutureProjections extends TestBase { done => val f = future { 0 } f.failed onComplete { - case Right(t) => + case Success(t) => assert(false) - case Left(t) => + case Failure(t) => assert(t.isInstanceOf[NoSuchElementException]) done() } diff --git a/test/files/pos/Transactions.scala b/test/files/pos/Transactions.scala index 9b4388300b..525eff7514 100644 --- a/test/files/pos/Transactions.scala +++ b/test/files/pos/Transactions.scala @@ -1,4 +1,4 @@ -package scala.concurrent +package scala.concurrent1 class AbortException extends RuntimeException |