Merge branch 'devel' into async-improvements

2017-12-11 15:12:45 +01:00 · 2017-12-11 15:12:45 +01:00 · 5e43e0d789
commit 5e43e0d789
parent 94fe5bd118 28e0bf9dcd
95 changed files with 9598 additions and 948 deletions
--- a/lib/pure/asyncdispatch.nim
+++ b/lib/pure/asyncdispatch.nim
@ -59,9 +59,10 @@ export asyncfutures, asyncstreams
 ##
 ##   .. code-block::nim
 ##      var future = socket.recv(100)
-##      future.callback =
+##      future.addCallback(
 ##        proc () =
 ##          echo(future.read)
+##      )
 ##
 ## All asynchronous functions returning a ``Future`` will not block. They
 ## will not however return immediately. An asynchronous function will have