diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-01-08 07:17:48 -0800 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-08 07:17:48 -0800 |
| commit | 9bbc14a6cd012c33bf8070a45fb5d424d5e2e01b (patch) | |
| tree | 1e1962bd11abc2bb7c590b21556cfde2efa47df2 /README.md | |
| parent | 1e531822bde30840b6e3134939bb2a91c93542c2 (diff) | |
| parent | 3da464a8ee27ad5a1cd0c99dc5b73cafba6ce738 (diff) | |
| download | scala-async-9bbc14a6cd012c33bf8070a45fb5d424d5e2e01b.tar.gz scala-async-9bbc14a6cd012c33bf8070a45fb5d424d5e2e01b.tar.bz2 scala-async-9bbc14a6cd012c33bf8070a45fb5d424d5e2e01b.zip | |
Merge pull request #20 from theon/patch-1
Fix line numbers for example in README
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -47,7 +47,7 @@ val x: Int = Await.result(combined, 10.seconds) // 05 Lines 1 defines an asynchronous method: it returns a `Future`. -Line 3 begins an `async` block. During compilation, +Line 2 begins an `async` block. During compilation, the contents of this block will be analyzed to identify the `await` calls, and transformed into non-blocking code. @@ -56,7 +56,7 @@ Control flow will immediately pass to line 5, as the computation in the `async` block is not executed on the caller's thread. -Line 4 begins by triggering `slowCalcFuture`, and then +Line 3 begins by triggering `slowCalcFuture`, and then suspending until it has been calculating. Only after it has finished, we trigger it again, and suspend again. Finally, we add the results and complete `combined`, which |