diff options
| author | bors <bors@rust-lang.org> | 2024-12-23 09:36:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-23 09:36:29 +0000 |
| commit | 85c39893a761fe4c050523278da4e7e45ab42b6e (patch) | |
| tree | 6276d6850996e9e409eac3677dfcf724822a610d /src/tools/rust-analyzer/crates | |
| parent | 66bb586952e095b8ee52e40b7d63a9bb0d19c5a2 (diff) | |
| parent | 8fc4ba2ac1e979bf72a630b6596ce98edcda94b8 (diff) | |
| download | rust-85c39893a761fe4c050523278da4e7e45ab42b6e.tar.gz rust-85c39893a761fe4c050523278da4e7e45ab42b6e.zip | |
Auto merge of #134677 - tgross35:rollup-ozoeyop, r=tgross35
Rollup of 4 pull requests Successful merges: - #129220 (Add platform docs for FreeBSD.) - #134659 (test-infra: improve compiletest and run-make-support symlink handling) - #134668 (Make sure we don't lose default struct value when formatting struct) - #134672 (Revert stabilization of the `#[coverage(..)]` attribute) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/rust-analyzer/crates')
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs b/src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs index 2bba410de02..9a7a1a01a09 100644 --- a/src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs +++ b/src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs @@ -237,7 +237,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ template!(List: "address, kcfi, memory, thread"), DuplicatesOk, experimental!(no_sanitize) ), - ungated!(coverage, Normal, template!(Word, List: "on|off"), WarnFollowing), + gated!(coverage, Normal, template!(Word, List: "on|off"), WarnFollowing, coverage_attribute, experimental!(coverage)), ungated!( doc, Normal, template!(List: "hidden|inline|...", NameValueStr: "string"), DuplicatesOk |