diff options
| author | bors <bors@rust-lang.org> | 2025-07-25 00:51:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-25 00:51:03 +0000 |
| commit | 4229c2e708ce796c71747b7fa177ff4ef9aa794c (patch) | |
| tree | da3488c994674fb8f6b64dc2ab210749c38a0698 /compiler/rustc_middle/src | |
| parent | 20c571f4ca4689572df8c27fdde8eaa36d77a11d (diff) | |
| parent | 156e2a61ddc90d23f49ee1e175a5f8f566c96ca3 (diff) | |
| download | rust-4229c2e708ce796c71747b7fa177ff4ef9aa794c.tar.gz rust-4229c2e708ce796c71747b7fa177ff4ef9aa794c.zip | |
Auto merge of #144414 - cuviper:beta-next, r=cuviper
[beta] backports - Reword mismatched-lifetime-syntaxes text based on feedback rust-lang/rust#143914 - Fix `-Ctarget-feature`s getting ignored after `crt-static` rust-lang/rust#144143 - Mitigate `#[align]` name resolution ambiguity regression with a rename rust-lang/rust#144080 r? cuviper
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/middle/codegen_fn_attrs.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs index 2f16d385efb..8d905862c64 100644 --- a/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs +++ b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs @@ -48,6 +48,7 @@ pub struct CodegenFnAttrs { /// switching between multiple instruction sets. pub instruction_set: Option<InstructionSetAttr>, /// The `#[align(...)]` attribute. Determines the alignment of the function body. + // FIXME(#82232, #143834): temporarily renamed to mitigate `#[align]` nameres ambiguity pub alignment: Option<Align>, /// The `#[patchable_function_entry(...)]` attribute. Indicates how many nops should be around /// the function entry. |