about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorGiles Cope <gilescope@gmail.com>2019-12-25 22:59:26 +0000
committerGiles Cope <gilescope@gmail.com>2019-12-29 08:19:33 +0000
commitbc1b2d5017fd99ac0814167473d00e236a5ebbac (patch)
tree303405a751f3dd8ca7fce289b63a8a6850411133 /src/libstd
parent84d8f9ddd3819501735d30b3c584c6935ef6c9da (diff)
downloadrust-bc1b2d5017fd99ac0814167473d00e236a5ebbac.tar.gz
rust-bc1b2d5017fd99ac0814167473d00e236a5ebbac.zip
Some keyword documentation.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/keyword_docs.rs27
1 files changed, 23 insertions, 4 deletions
diff --git a/src/libstd/keyword_docs.rs b/src/libstd/keyword_docs.rs
index 7901c8197b5..5c7ee9bded9 100644
--- a/src/libstd/keyword_docs.rs
+++ b/src/libstd/keyword_docs.rs
@@ -1149,20 +1149,39 @@ mod where_keyword {}
 //
 /// Return a [`Future`] instead of blocking the current thread.
 ///
-/// The documentation for this keyword is [not yet complete]. Pull requests welcome!
+/// Use `async` in front of `fn`, `closure`, or a `block` to turn the marked code into a `Future`.
+/// As such the code will not be run immediately, but will only be evaluated when the returned
+/// future is `.await`ed.
+///
+/// We have written an [async book] detailing async/await and trade-offs compared to using threads.
+///
+/// ## Editions
+///
+/// `async` is a keyword from the 2018 edition onwards.
+///
+/// It is available for use in stable rust from version 1.39 onwards.
 ///
 /// [`Future`]: ./future/trait.Future.html
-/// [not yet complete]: https://github.com/rust-lang/rust/issues/34601
+/// [async book]: https://rust-lang.github.io/async-book/
 mod async_keyword {}
 
 #[doc(keyword = "await")]
 //
 /// Suspend execution until the result of a [`Future`] is ready.
 ///
-/// The documentation for this keyword is [not yet complete]. Pull requests welcome!
+/// `.await`ing a future will suspend the current function's execution until the `executor`
+/// has run the future to completion.
+///
+/// Read the [async book] for details on how async/await and executors work.
+///
+/// ## Editions
+///
+/// `await` is a keyword from the 2018 edition onwards.
+///
+/// It is available for use in stable rust from version 1.39 onwards.
 ///
 /// [`Future`]: ./future/trait.Future.html
-/// [not yet complete]: https://github.com/rust-lang/rust/issues/34601
+/// [async book]: https://rust-lang.github.io/async-book/
 mod await_keyword {}
 
 #[doc(keyword = "dyn")]