about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-05 10:00:08 +0000
committerbors <bors@rust-lang.org>2018-06-05 10:00:08 +0000
commit4122885e0f99b3f28e65c122cde48de5bfc8231a (patch)
treec407ccc9ccd3286386bb80309ba139abc0eea5c2 /src/libstd
parentf33db06e1d95249de95202664340d8639ec15c57 (diff)
parent2f7fa24aee7f7e69f9fbc37e8d2084fb1c898e97 (diff)
downloadrust-4122885e0f99b3f28e65c122cde48de5bfc8231a.tar.gz
rust-4122885e0f99b3f28e65c122cde48de5bfc8231a.zip
Auto merge of #51140 - GuillaumeGomez:doc-keyword, r=QuietMisdreavus
rustdoc: introduce the #[doc(keyword="")] attribute for documenting keywords

Part of #34601.

r? @QuietMisdreavus
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index c576245edb7..8266cec5139 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -316,6 +316,7 @@
 #![cfg_attr(test, feature(update_panic_count))]
 #![cfg_attr(windows, feature(used))]
 #![feature(doc_alias)]
+#![feature(doc_keyword)]
 #![feature(float_internals)]
 #![feature(panic_info_message)]
 #![cfg_attr(not(stage0), feature(panic_implementation))]