Skip to content

Fix line numbers for example in README #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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.
Expand All @@ -47,7 +47,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
Expand Down