about summary refs log tree commit diff
path: root/src/libstd/keyword_docs.rs
diff options
context:
space:
mode:
authorBaoshan <pangbw@gmail.com>2019-08-20 15:43:55 -0700
committerGitHub <noreply@github.com>2019-08-20 15:43:55 -0700
commit0c8a14c7fb34d6edbc2b24495bb0774aeae27b98 (patch)
tree49f35638545ccd98762e91fc712d09533ad869e5 /src/libstd/keyword_docs.rs
parent7ab6fa09143f87414485e25cfc29727f5d1f0b8a (diff)
parentbea0372a1a7a31b81f28cc4d9a83a2dc9a79d008 (diff)
downloadrust-0c8a14c7fb34d6edbc2b24495bb0774aeae27b98.tar.gz
rust-0c8a14c7fb34d6edbc2b24495bb0774aeae27b98.zip
Merge pull request #6 from rust-lang/master
rebase code from rust-lang/rust master branch
Diffstat (limited to 'src/libstd/keyword_docs.rs')
-rw-r--r--src/libstd/keyword_docs.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/keyword_docs.rs b/src/libstd/keyword_docs.rs
index f5018485ef7..85a9dea09ed 100644
--- a/src/libstd/keyword_docs.rs
+++ b/src/libstd/keyword_docs.rs
@@ -984,7 +984,6 @@ mod where_keyword { }
 
 // 2018 Edition keywords
 
-#[unstable(feature = "async_await", issue = "50547")]
 #[doc(keyword = "async")]
 //
 /// Return a [`Future`] instead of blocking the current thread.
@@ -995,7 +994,6 @@ mod where_keyword { }
 /// [not yet complete]: https://github.com/rust-lang/rust/issues/34601
 mod async_keyword { }
 
-#[unstable(feature = "async_await", issue = "50547")]
 #[doc(keyword = "await")]
 //
 /// Suspend execution until the result of a [`Future`] is ready.