The default implementations for some of the future methods.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 972a76a95a..5ab712b89a 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -1,30 +1,34 @@
 package scala.concurrent
 
+
 import java.util.concurrent.{ Executors, Future => JFuture }
 import scala.util.{ Duration, Timeout }
 import scala.concurrent.forkjoin.{ ForkJoinPool, RecursiveTask => FJTask, RecursiveAction, ForkJoinWorkerThread }
 
-trait ExecutionContext {
 
+trait ExecutionContext {
+  
   protected implicit object CanBlockEvidence extends CanBlock
   
   def execute(task: Runnable): Unit
   
   def makeTask[T](task: () => T)(implicit timeout: Timeout): Task[T]
   
-  def makePromise[T](timeout: Timeout): Promise[T]
+  def makePromise[T](implicit timeout: Timeout): Promise[T]
   
   def blockingCall[T](body: Blockable[T]): T
-
+  
 }
 
-trait Task[T] {
 
+trait Task[T] {
+  
   def start(): Unit
   def future: Future[T]
-
+  
 }
 
+
 /* DONE: The challenge is to make ForkJoinPromise inherit from RecursiveAction
  * to avoid an object allocation per promise. This requires turning DefaultPromise
  * into a trait, i.e., removing its constructor parameters.