Merge pull request #18874 from lnicola/sync-from-rust

minor: Sync from downstream
rust-lang · Jan 7, 2025 · 91fc0a2 · 91fc0a2
2 parents fff6680 + f5e698d
commit 91fc0a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/hir-expand/src/inert_attr_macro.rs b/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

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0eca4dd3205a01dba4bd7b7c140ec370aff03440
+fb546ee09b226bc4dd4b712d35a372d923c4fa54
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0eca4dd3205a01dba4bd7b7c140ec370aff03440
		fb546ee09b226bc4dd4b712d35a372d923c4fa54