about summary refs log tree commit diff
path: root/compiler/rustc_parse/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-07-08 17:31:40 +0000
committerbors <bors@rust-lang.org>2025-07-08 17:31:40 +0000
commitab68b0fb26485ab1fa6977b2d8b59cc8a171c4aa (patch)
tree9005a774102752e63c61648c7d57543e7e3de7ab /compiler/rustc_parse/src
parentf838cbc06de60819faff3413f374706b74824ca2 (diff)
parentf3226b47b85c3ed9d1db799c16d9397361696b1e (diff)
downloadrust-ab68b0fb26485ab1fa6977b2d8b59cc8a171c4aa.tar.gz
rust-ab68b0fb26485ab1fa6977b2d8b59cc8a171c4aa.zip
Auto merge of #143645 - matthiaskrgr:rollup-d2a3leo, r=matthiaskrgr
Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#143402 (Port several linking (linkage?) related attributes the new attribute system )
 - rust-lang/rust#143555 (Don't mark `#[target_feature]` safe fns as unsafe in rustdoc JSON.)
 - rust-lang/rust#143593 (Port #[rustc_dummy])
 - rust-lang/rust#143600 (Update intro blurb in `wasm32-wasip1` docs)
 - rust-lang/rust#143603 (Clarify the meaning of `AttributeOrder::KeepFirst` and `AttributeOrder::KeepLast`)
 - rust-lang/rust#143620 (fix: Remove newline from multiple crate versions note)
 - rust-lang/rust#143622 (Add target maintainer information for mips64-unknown-linux-muslabi64)

Failed merges:

 - rust-lang/rust#143403 (Port several trait/coherence-related attributes the new attribute system)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
-rw-r--r--compiler/rustc_parse/src/validate_attr.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs
index 67b68e77d2b..11424ec3724 100644
--- a/compiler/rustc_parse/src/validate_attr.rs
+++ b/compiler/rustc_parse/src/validate_attr.rs
@@ -271,6 +271,10 @@ pub fn check_builtin_meta_item(
         if matches!(
             name,
             sym::inline
+                | sym::export_stable
+                | sym::ffi_const
+                | sym::ffi_pure
+                | sym::rustc_std_internal_symbol
                 | sym::may_dangle
                 | sym::rustc_as_ptr
                 | sym::rustc_pub_transparent