diff options
| author | bors <bors@rust-lang.org> | 2025-07-08 17:31:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-08 17:31:40 +0000 |
| commit | ab68b0fb26485ab1fa6977b2d8b59cc8a171c4aa (patch) | |
| tree | 9005a774102752e63c61648c7d57543e7e3de7ab /compiler/rustc_attr_data_structures | |
| parent | f838cbc06de60819faff3413f374706b74824ca2 (diff) | |
| parent | f3226b47b85c3ed9d1db799c16d9397361696b1e (diff) | |
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_attr_data_structures')
| -rw-r--r-- | compiler/rustc_attr_data_structures/src/attributes.rs | 15 | ||||
| -rw-r--r-- | compiler/rustc_attr_data_structures/src/encode_cross_crate.rs | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/compiler/rustc_attr_data_structures/src/attributes.rs b/compiler/rustc_attr_data_structures/src/attributes.rs index 2cbb7270785..b656db32528 100644 --- a/compiler/rustc_attr_data_structures/src/attributes.rs +++ b/compiler/rustc_attr_data_structures/src/attributes.rs @@ -240,6 +240,9 @@ pub enum AttributeKind { /// Represents [`#[doc]`](https://doc.rust-lang.org/stable/rustdoc/write-documentation/the-doc-attribute.html). DocComment { style: AttrStyle, kind: CommentKind, span: Span, comment: Symbol }, + /// Represents `#[rustc_dummy]`. + Dummy, + /// Represents [`#[export_name]`](https://doc.rust-lang.org/reference/abi.html#the-export_name-attribute). ExportName { /// The name to export this item with. @@ -248,6 +251,15 @@ pub enum AttributeKind { span: Span, }, + /// Represents `#[export_stable]`. + ExportStable, + + /// Represents `#[ffi_const]`. + FfiConst(Span), + + /// Represents `#[ffi_pure]`. + FfiPure(Span), + /// Represents `#[ignore]` Ignore { span: Span, @@ -326,6 +338,9 @@ pub enum AttributeKind { span: Span, }, + /// Represents `#[rustc_std_internal_symbol]`. + StdInternalSymbol(Span), + /// Represents `#[target_feature(enable = "...")]` TargetFeature(ThinVec<(Symbol, Span)>, Span), diff --git a/compiler/rustc_attr_data_structures/src/encode_cross_crate.rs b/compiler/rustc_attr_data_structures/src/encode_cross_crate.rs index a6ae49d2808..5414c7b103b 100644 --- a/compiler/rustc_attr_data_structures/src/encode_cross_crate.rs +++ b/compiler/rustc_attr_data_structures/src/encode_cross_crate.rs @@ -25,7 +25,11 @@ impl AttributeKind { ConstStabilityIndirect => No, Deprecation { .. } => Yes, DocComment { .. } => Yes, + Dummy => No, ExportName { .. } => Yes, + ExportStable => No, + FfiConst(..) => No, + FfiPure(..) => No, Ignore { .. } => No, Inline(..) => No, LinkName { .. } => Yes, @@ -48,6 +52,7 @@ impl AttributeKind { RustcObjectLifetimeDefault => No, SkipDuringMethodDispatch { .. } => No, Stability { .. } => Yes, + StdInternalSymbol(..) => No, TargetFeature(..) => No, TrackCaller(..) => Yes, Used { .. } => No, |
