diff options
| author | bors <bors@rust-lang.org> | 2024-01-19 08:42:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-19 08:42:17 +0000 |
| commit | 92d727796be7c882d2efbc06e08bbf4743cf29dc (patch) | |
| tree | dfa01ef8715c67165d86640add0cdd9f89aa8a18 /compiler/rustc_feature/src | |
| parent | 16fadb3f252bcfc5ee3f0be09472c9600a052202 (diff) | |
| parent | 9c6795baab8bc343c8573ea4ea4c2b550f6bc0ac (diff) | |
| download | rust-92d727796be7c882d2efbc06e08bbf4743cf29dc.tar.gz rust-92d727796be7c882d2efbc06e08bbf4743cf29dc.zip | |
Auto merge of #120112 - matthiaskrgr:rollup-48o3919, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #119582 (bootstrap: handle vendored sources when remapping crate paths) - #119730 (docs: fix typos) - #119828 (Improved collapse_debuginfo attribute, added command-line flag) - #119869 (replace `track_errors` usages with bubbling up `ErrorGuaranteed`) - #120037 (Remove `next_root_ty_var`) - #120094 (tests/ui/asm/inline-syntax: adapt for LLVM 18) - #120096 (Set RUSTC_BOOTSTRAP=1 consistently) - #120101 (change `.unwrap()` to `?` on write where `fmt::Result` is returned) - #120102 (Fix typo in munmap_partial.rs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_feature/src')
| -rw-r--r-- | compiler/rustc_feature/src/builtin_attrs.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs index 4442b67df6e..68b6f69854d 100644 --- a/compiler/rustc_feature/src/builtin_attrs.rs +++ b/compiler/rustc_feature/src/builtin_attrs.rs @@ -469,7 +469,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ // `#[collapse_debuginfo]` gated!( - collapse_debuginfo, Normal, template!(Word), WarnFollowing, + collapse_debuginfo, Normal, template!(Word, List: "no|external|yes"), ErrorFollowing, experimental!(collapse_debuginfo) ), |