Skip to content

Commit da929c8

Browse files
committed
Merge pull request scala#3413 from paulp/pr/future
Fix misuse of underscores.
2 parents 18c9196 + 97d14c5 commit da929c8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/library/scala/concurrent/Future.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,9 @@ object Future {
494494
/** Simple version of `Future.traverse`. Transforms a `TraversableOnce[Future[A]]` into a `Future[TraversableOnce[A]]`.
495495
* Useful for reducing many `Future`s into a single `Future`.
496496
*/
497-
def sequence[A, M[_] <: TraversableOnce[_]](in: M[Future[A]])(implicit cbf: CanBuildFrom[M[Future[A]], A, M[A]], executor: ExecutionContext): Future[M[A]] = {
497+
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]] = {
498498
in.foldLeft(successful(cbf(in))) {
499-
(fr, fa) => for (r <- fr; a <- fa.asInstanceOf[Future[A]]) yield (r += a)
499+
(fr, fa) => for (r <- fr; a <- fa) yield (r += a)
500500
} map (_.result())
501501
}
502502

@@ -569,9 +569,9 @@ object Future {
569569
* val myFutureList = Future.traverse(myList)(x => Future(myFunc(x)))
570570
* }}}
571571
*/
572-
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]] =
572+
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]] =
573573
in.foldLeft(successful(cbf(in))) { (fr, a) =>
574-
val fb = fn(a.asInstanceOf[A])
574+
val fb = fn(a)
575575
for (r <- fr; b <- fb) yield (r += b)
576576
}.map(_.result())
577577

0 commit comments

Comments
 (0)