diff options
| author | bors <bors@rust-lang.org> | 2025-06-19 03:27:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-19 03:27:53 +0000 |
| commit | 8a65ee08296b36342bf7c3cdc15312ccbc357227 (patch) | |
| tree | dd41afef08338c59067cd819c05f4a571ad2f36b /compiler/rustc_attr_data_structures | |
| parent | d1d8e386c5e84c4ba857f56c3291f73c27e2d62a (diff) | |
| parent | 986f8cd709f9a9a6ac8888e4f1fe5eaf3dbfdefd (diff) | |
| download | rust-8a65ee08296b36342bf7c3cdc15312ccbc357227.tar.gz rust-8a65ee08296b36342bf7c3cdc15312ccbc357227.zip | |
Auto merge of #142697 - tgross35:rollup-xu4yuq6, r=tgross35
Rollup of 7 pull requests Successful merges: - rust-lang/rust#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs) - rust-lang/rust#142507 (use `#[align]` attribute for `fn_align`) - rust-lang/rust#142524 (Weekly `cargo update`) - rust-lang/rust#142606 (AsyncDrop trait without sync Drop generates an error) - rust-lang/rust#142639 (Add a missing colon at the end of the panic location details in location-detail-unwrap-multiline.rs) - rust-lang/rust#142654 (library: Increase timeout on mpmc test to reduce flakes) - rust-lang/rust#142692 (Assorted bootstrap cleanups (step 3)) 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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_attr_data_structures/src/attributes.rs b/compiler/rustc_attr_data_structures/src/attributes.rs index d4c43456049..cdc01dc6c91 100644 --- a/compiler/rustc_attr_data_structures/src/attributes.rs +++ b/compiler/rustc_attr_data_structures/src/attributes.rs @@ -182,6 +182,9 @@ impl Deprecation { #[derive(Clone, Debug, HashStable_Generic, Encodable, Decodable, PrintAttribute)] pub enum AttributeKind { // tidy-alphabetical-start + /// Represents `#[align(N)]`. + Align { align: Align, span: Span }, + /// Represents `#[rustc_allow_const_fn_unstable]`. AllowConstFnUnstable(ThinVec<Symbol>), |