diff options
| author | bors <bors@rust-lang.org> | 2024-07-27 18:29:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-27 18:29:13 +0000 |
| commit | fbccf50533b1f287edccb1fc0dd847cd78a1a27e (patch) | |
| tree | b1a462aa09b0b4a5190ea4f6534d65958a532c2c /compiler/rustc_builtin_macros/src/errors.rs | |
| parent | d9e1dea75e0f57d489068460ef32127e291a07c4 (diff) | |
| parent | f62ae7e120438a5802c50bab84bcf983a7014bb7 (diff) | |
| download | rust-fbccf50533b1f287edccb1fc0dd847cd78a1a27e.tar.gz rust-fbccf50533b1f287edccb1fc0dd847cd78a1a27e.zip | |
Auto merge of #128278 - tgross35:rollup-zv7q0h5, r=tgross35
Rollup of 8 pull requests Successful merges: - #125897 (from_ref, from_mut: clarify documentation) - #128207 (improve error message when `global_asm!` uses `asm!` options) - #128241 (Remove logic to suggest clone of function output) - #128259 ([illumos/solaris] set MSG_NOSIGNAL while writing to sockets) - #128262 (Delete `SimplifyArmIdentity` and `SimplifyBranchSame` tests) - #128266 (update `rust.channel` default value documentation) - #128267 (Add rustdoc GUI test to check title with and without search) - #128271 (Disable jump threading of float equality) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_builtin_macros/src/errors.rs')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/errors.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/compiler/rustc_builtin_macros/src/errors.rs b/compiler/rustc_builtin_macros/src/errors.rs index 49d640436c2..2e6bdae14a8 100644 --- a/compiler/rustc_builtin_macros/src/errors.rs +++ b/compiler/rustc_builtin_macros/src/errors.rs @@ -846,6 +846,17 @@ pub(crate) struct AsmOptAlreadyprovided { } #[derive(Diagnostic)] +#[diag(builtin_macros_global_asm_unsupported_option)] +pub(crate) struct GlobalAsmUnsupportedOption { + #[primary_span] + #[label] + pub(crate) span: Span, + pub(crate) symbol: Symbol, + #[suggestion(code = "", applicability = "machine-applicable", style = "tool-only")] + pub(crate) full_span: Span, +} + +#[derive(Diagnostic)] #[diag(builtin_macros_test_runner_invalid)] pub(crate) struct TestRunnerInvalid { #[primary_span] |
