diff options
| author | bors <bors@rust-lang.org> | 2021-05-19 04:44:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-19 04:44:09 +0000 |
| commit | 9f8012e3aa8d5b087100ecd7b109ed3dd2859cca (patch) | |
| tree | 355bae166d5db61da88e4f7f06384a4ad64f38a7 /compiler/rustc_errors/src | |
| parent | 3d31363338bc3a4db66237f5be10389cfd01201b (diff) | |
| parent | 6cfcbf7d032bc4d990ac2121730866849602e174 (diff) | |
| download | rust-9f8012e3aa8d5b087100ecd7b109ed3dd2859cca.tar.gz rust-9f8012e3aa8d5b087100ecd7b109ed3dd2859cca.zip | |
Auto merge of #85458 - jackh726:rollup-zvvybmt, r=jackh726
Rollup of 8 pull requests Successful merges: - #83366 (Stabilize extended_key_value_attributes) - #83767 (Fix v0 symbol mangling bug) - #84883 (compiletest: "fix" FileCheck with --allow-unused-prefixes) - #85274 (Only pass --[no-]gc-sections if linker is GNU ld.) - #85297 (bootstrap: build cargo only if requested in tools) - #85396 (rustdoc: restore header sizes) - #85425 (Fix must_use on `Option::is_none`) - #85438 (Fix escape handling) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index f53ce7ceace..65352f0bc6e 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -5,7 +5,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![feature(crate_visibility_modifier)] #![feature(backtrace)] -#![feature(extended_key_value_attributes)] +#![cfg_attr(bootstrap, feature(extended_key_value_attributes))] #![feature(format_args_capture)] #![feature(iter_zip)] #![feature(nll)] |