From aa6e9d742487eb2ec61c5d548872a4d9d60adb2e Mon Sep 17 00:00:00 2001 From: Paul Draper Date: Wed, 30 Sep 2015 16:59:52 -0600 Subject: Use InternalCallbackExecutor in Future.sequence Previously _.result() was invoked in the "real" ExecutionContext, but this is an unnecessary use of the context. --- src/library/scala/concurrent/Future.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/library') diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index 914646320c..294ca2aa48 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -497,7 +497,7 @@ object Future { def sequence[A, M[X] <: TraversableOnce[X]](in: M[Future[A]])(implicit cbf: CanBuildFrom[M[Future[A]], A, M[A]], executor: ExecutionContext): Future[M[A]] = { in.foldLeft(successful(cbf(in))) { (fr, fa) => for (r <- fr; a <- fa) yield (r += a) - } map (_.result()) + }.map(_.result())(InternalCallbackExecutor) } /** Returns a new `Future` to the result of the first future in the list that is completed. -- cgit v1.2.3