summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-01-26 18:51:10 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-01-26 18:51:10 -0800
commitda929c86696787f91c1cee775b158faeb23a9b50 (patch)
treea6138d124a0fedcd2e393b39d63ae5a515feb43b
parent18c9196686410536f69f8e05b62f0cd7e0b91a8c (diff)
parent97d14c5cd6ec44c46f6084111b3a55ebf8b1d109 (diff)
downloadscala-da929c86696787f91c1cee775b158faeb23a9b50.tar.gz
scala-da929c86696787f91c1cee775b158faeb23a9b50.tar.bz2
scala-da929c86696787f91c1cee775b158faeb23a9b50.zip
Merge pull request #3413 from paulp/pr/future
Fix misuse of underscores.
-rw-r--r--src/library/scala/concurrent/Future.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index d271c4cdeb..4ed0687334 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -494,9 +494,9 @@ object Future {
/** Simple version of `Future.traverse`. Transforms a `TraversableOnce[Future[A]]` into a `Future[TraversableOnce[A]]`.
* Useful for reducing many `Future`s into a single `Future`.
*/
- def sequence[A, M[_] <: TraversableOnce[_]](in: M[Future[A]])(implicit cbf: CanBuildFrom[M[Future[A]], A, M[A]], executor: ExecutionContext): Future[M[A]] = {
+ 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.asInstanceOf[Future[A]]) yield (r += a)
+ (fr, fa) => for (r <- fr; a <- fa) yield (r += a)
} map (_.result())
}
@@ -569,9 +569,9 @@ object Future {
* val myFutureList = Future.traverse(myList)(x => Future(myFunc(x)))
* }}}
*/
- def traverse[A, B, M[_] <: TraversableOnce[_]](in: M[A])(fn: A => Future[B])(implicit cbf: CanBuildFrom[M[A], B, M[B]], executor: ExecutionContext): Future[M[B]] =
+ def traverse[A, B, M[X] <: TraversableOnce[X]](in: M[A])(fn: A => Future[B])(implicit cbf: CanBuildFrom[M[A], B, M[B]], executor: ExecutionContext): Future[M[B]] =
in.foldLeft(successful(cbf(in))) { (fr, a) =>
- val fb = fn(a.asInstanceOf[A])
+ val fb = fn(a)
for (r <- fr; b <- fb) yield (r += b)
}.map(_.result())