summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-05-15 04:22:35 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-05-15 04:22:35 -0700
commit6a3efe3b3e83c37182268f0e0bab9acc69653115 (patch)
tree713a4d511bce3e70f751fc26410bb4d04ac0a732 /src
parent03ef18f649a2134b8995e953691c88616961439d (diff)
parent6486f9f5b8347df6cc9357ff9d2adbd68bfbb83d (diff)
downloadscala-6a3efe3b3e83c37182268f0e0bab9acc69653115.tar.gz
scala-6a3efe3b3e83c37182268f0e0bab9acc69653115.tar.bz2
scala-6a3efe3b3e83c37182268f0e0bab9acc69653115.zip
Merge pull request #2498 from rladstaetter/patch-1
fix typo in comment
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 95b393dd0e..c444050e3d 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -71,7 +71,7 @@ import scala.reflect.ClassTag
* val g = future { 3 }
* val h = for {
* x: Int <- f // returns Future(5)
- * y: Int <- g // returns Future(5)
+ * y: Int <- g // returns Future(3)
* } yield x + y
* }}}
*