diff options
| author | bors <bors@rust-lang.org> | 2021-11-24 23:09:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-24 23:09:42 +0000 |
| commit | d2c24aabcddd1eb11af633ab6b7391ae0cd00ea2 (patch) | |
| tree | d195ee55e89dd213150f665feeb6943ee5397c90 /library/std/src/lib.rs | |
| parent | b426445c60b4faab6e96d2b866164d478680abf6 (diff) | |
| parent | ae9681ecfad21f218ac3524dc798aafa35088202 (diff) | |
Auto merge of #91203 - GuillaumeGomez:rollup-kwtqvb1, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #89542 (Partially stabilize `duration_consts_2`) - #90044 (Restrict aarch64 outline atomics to glibc for now.) - #90420 (Create rustdoc_internals feature gate) - #91075 (Reduce prominence of item-infos) - #91151 (Fix test in std::process on android) - #91179 (Fix more <a> color) - #91199 (rustdoc: Add test for mixing doc comments and attrs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/lib.rs')
| -rw-r--r-- | library/std/src/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index afd8d8edaa1..504c3b7e9f9 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -275,10 +275,11 @@ #![feature(decl_macro)] #![feature(doc_cfg)] #![feature(doc_cfg_hide)] -#![feature(doc_keyword)] +#![cfg_attr(bootstrap, feature(doc_primitive))] +#![cfg_attr(bootstrap, feature(doc_keyword))] +#![cfg_attr(not(bootstrap), feature(rustdoc_internals))] #![feature(doc_masked)] #![feature(doc_notable_trait)] -#![feature(doc_primitive)] #![feature(dropck_eyepatch)] #![feature(duration_checked_float)] #![feature(duration_constants)] |