summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViktor Klang <viktor.klang@gmail.com>2012-04-13 17:21:52 +0200
committerViktor Klang <viktor.klang@gmail.com>2012-04-13 17:21:52 +0200
commit828aa0aaa9288c57f4574ca267a38173d15c458f (patch)
tree45f82b79e0cf2c18852093568725c416032be9e6 /src
parenta2115b2352700dfc32a99663086871a2cd192685 (diff)
downloadscala-828aa0aaa9288c57f4574ca267a38173d15c458f.tar.gz
scala-828aa0aaa9288c57f4574ca267a38173d15c458f.tar.bz2
scala-828aa0aaa9288c57f4574ca267a38173d15c458f.zip
Making sure that the ScalaDoc for Future.apply has the right names
Diffstat (limited to 'src')
-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 16432f6aac..f331263d39 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -520,7 +520,7 @@ object Future {
* @param execctx the execution context on which the future is run
* @return the `Future` holding the result of the computation
*/
- def apply[T](body: =>T)(implicit executor: ExecutionContext): Future[T] = impl.Future(body)
+ def apply[T](body: =>T)(implicit execctx: ExecutionContext): Future[T] = impl.Future(body)
import scala.collection.mutable.Builder
import scala.collection.generic.CanBuildFrom