summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/impl/Future.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-03-20 19:46:54 +0100
committerAleksandar Prokopec <axel22@gmail.com>2012-03-20 19:46:54 +0100
commit13a325b126ac6f2f5d2e7d1fc2c008d012367430 (patch)
tree7e0f42e6e87cf5e2d80aaac9c3623e23d5b9455e /src/library/scala/concurrent/impl/Future.scala
parent1ba08472d6b3cf309211c6f912cc895e3a63fee0 (diff)
downloadscala-13a325b126ac6f2f5d2e7d1fc2c008d012367430.tar.gz
scala-13a325b126ac6f2f5d2e7d1fc2c008d012367430.tar.bz2
scala-13a325b126ac6f2f5d2e7d1fc2c008d012367430.zip
Deprecate scala.parallel.Future and privatize a few classes.
Diffstat (limited to 'src/library/scala/concurrent/impl/Future.scala')
-rw-r--r--src/library/scala/concurrent/impl/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/impl/Future.scala b/src/library/scala/concurrent/impl/Future.scala
index 9466761d4d..b4385ea34a 100644
--- a/src/library/scala/concurrent/impl/Future.scala
+++ b/src/library/scala/concurrent/impl/Future.scala
@@ -12,7 +12,7 @@ import scala.concurrent.{Awaitable, ExecutionContext}
import scala.util.{ Try, Success, Failure }
//import scala.util.continuations._
-trait Future[+T] extends scala.concurrent.Future[T] with Awaitable[T] {
+private[concurrent] trait Future[+T] extends scala.concurrent.Future[T] with Awaitable[T] {
implicit def executor: ExecutionContextImpl