diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-07 07:02:57 -0800 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-07 07:02:57 -0800 |
commit | 1eace2719a534bf60cde7ada851688b490ff6d3c (patch) | |
tree | 571cc37a586afe13f22963082f5e0ec34ab7c56a /src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala | |
parent | 6a2b940ac6b7e511270079e1b6278c844a57f5d1 (diff) | |
parent | ec5fcf703df4d6aa3ed53316fbe49989ea3fa1b1 (diff) | |
download | scala-async-1eace2719a534bf60cde7ada851688b490ff6d3c.tar.gz scala-async-1eace2719a534bf60cde7ada851688b490ff6d3c.tar.bz2 scala-async-1eace2719a534bf60cde7ada851688b490ff6d3c.zip |
Merge pull request #37 from retronym/topic/cleanup-cps-and-await
Minimize the public API
Diffstat (limited to 'src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala')
-rw-r--r-- | src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala b/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala deleted file mode 100644 index f864ad6..0000000 --- a/src/main/scala/scala/async/continuations/ScalaConcurrentCPSFallback.scala +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com> - */ - -package scala.async -package continuations - -import scala.util.continuations._ -import scala.concurrent.{Future, Promise, ExecutionContext} -import scala.async.internal.ScalaConcurrentFutureSystem - -trait ScalaConcurrentCPSFallback { - self: AsyncBaseWithCPSFallback => - - import ExecutionContext.Implicits.global - - lazy val futureSystem = ScalaConcurrentFutureSystem - type FS = ScalaConcurrentFutureSystem.type - - /* Fall-back for `await` when it is called at an unsupported position. - */ - override def awaitFallback[T](awaitable: futureSystem.Fut[T]): T @cps[Future[Any]] = - shift { - (k: (T => Future[Any])) => - val fr = Promise[Any]() - awaitable onComplete { - case tr => fr completeWith k(tr.get) - } - fr.future - } - -} |