summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-17 19:06:59 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-17 19:06:59 -0800
commit6e7aaf3602a86bd6786bbfebcd729e96b26e5864 (patch)
tree3c95d6c39357c8b2ee249e226ac93c79e420d8fb
parent4a225596a1bf3d6ecb358dca5aae884b82883090 (diff)
parented1cfc3f01ea597b3b21e31819d919acd847a11a (diff)
downloadscala-6e7aaf3602a86bd6786bbfebcd729e96b26e5864.tar.gz
scala-6e7aaf3602a86bd6786bbfebcd729e96b26e5864.tar.bz2
scala-6e7aaf3602a86bd6786bbfebcd729e96b26e5864.zip
Merge pull request #3151 from xuwei-k/future-typo
fix typo
-rw-r--r--src/library/scala/concurrent/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index dd86af0dd4..f905785bd6 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -488,7 +488,7 @@ object Future {
*/
def apply[T](body: =>T)(implicit @deprecatedName('execctx) executor: ExecutionContext): Future[T] = impl.Future(body)
- /** Simple version of `Futures.traverse`. Transforms a `TraversableOnce[Future[A]]` into a `Future[TraversableOnce[A]]`.
+ /** 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]] = {