Doc fix on exec ctx prepare method, fix to tests

2 files changed, 3 insertions, 2 deletions

diff --git a/src/library/scala/concurrent/ExecutionContext.scala b/src/library/scala/concurrent/ExecutionContext.scala
index 82c1cff4b1..1be6050303 100644
--- a/src/library/scala/concurrent/ExecutionContext.scala
+++ b/src/library/scala/concurrent/ExecutionContext.scala
@@ -29,7 +29,8 @@ trait ExecutionContext {
   def reportFailure(t: Throwable): Unit
   
   /** Prepares for the execution of a task. Returns the prepared
-   *  execution context.
+   *  execution context. A valid implementation of `prepare` is one
+   *  that simply returns `this`.
    */
   def prepare(): ExecutionContext = this
 
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 09e29d971d..bc0b437a33 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -312,7 +312,7 @@ trait Future[+T] extends Awaitable[T] {
       case Success(v) =>
         try {
           if (pred(v)) p success v
-          else p failure new NoSuchElementException("Future.filter predicate is not satisfied by: " + v)
+          else p failure new NoSuchElementException("Future.filter predicate is not satisfied")
         } catch {
           case NonFatal(t) => p failure t
         }