summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-03-21 13:37:39 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-03-21 13:37:39 +1000
commitad48e5918081c679546f50b6f52dd8e0813754e7 (patch)
tree7a3909e11eb83be87ecf7602f780806ac15fae15 /src/library
parent0f5801ed83179e4de4ec3e8a91ffc86d0e657f4f (diff)
parent910a18ed14dd81150f008e785f8773bf997eb1f6 (diff)
downloadscala-ad48e5918081c679546f50b6f52dd8e0813754e7.tar.gz
scala-ad48e5918081c679546f50b6f52dd8e0813754e7.tar.bz2
scala-ad48e5918081c679546f50b6f52dd8e0813754e7.zip
Merge pull request #5043 from dongjoon-hyun/fix_typos_in_spec_and_comments
Fix some typos in `spec` documents and comments.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/impl/Promise.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/impl/Promise.scala b/src/library/scala/concurrent/impl/Promise.scala
index 178cd6d912..626540425f 100644
--- a/src/library/scala/concurrent/impl/Promise.scala
+++ b/src/library/scala/concurrent/impl/Promise.scala
@@ -304,7 +304,7 @@ private[concurrent] object Promise {
/** Tries to add the callback, if already completed, it dispatches the callback to be executed.
* Used by `onComplete()` to add callbacks to a promise and by `link()` to transfer callbacks
- * to the root promise when linking two promises togehter.
+ * to the root promise when linking two promises together.
*/
@tailrec
private def dispatchOrAddCallback(runnable: CallbackRunnable[T]): Unit = {