diff options
| author | bors <bors@rust-lang.org> | 2024-04-23 11:02:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-23 11:02:14 +0000 |
| commit | ad07aa12c99698f810d730d7b5a49704c729651d (patch) | |
| tree | 03aa8e1daec65a69c33a695c064931699dce4056 /compiler/rustc_parse/src/errors.rs | |
| parent | c67277301c896857d0534f2bb7431680796833fb (diff) | |
| parent | 802f629cfe355625fda97e63f40ebc22120fcb64 (diff) | |
| download | rust-ad07aa12c99698f810d730d7b5a49704c729651d.tar.gz rust-ad07aa12c99698f810d730d7b5a49704c729651d.zip | |
Auto merge of #124289 - matthiaskrgr:rollup-oxw52jy, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #123050 (panic_str only exists for the migration to 2021 panic macros) - #124067 (weak lang items are not allowed to be #[track_caller]) - #124099 (Disallow ambiguous attributes on expressions) - #124284 (parser: remove unused(no reads) max_angle_bracket_count field) - #124288 (remove `push_trait_bound_inner`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/errors.rs')
| -rw-r--r-- | compiler/rustc_parse/src/errors.rs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/errors.rs b/compiler/rustc_parse/src/errors.rs index ca8de4240f4..b77045ee34e 100644 --- a/compiler/rustc_parse/src/errors.rs +++ b/compiler/rustc_parse/src/errors.rs @@ -496,6 +496,15 @@ pub(crate) struct OuterAttributeNotAllowedOnIfElse { } #[derive(Diagnostic)] +#[diag(parse_outer_attr_ambiguous)] +pub(crate) struct AmbiguousOuterAttributes { + #[primary_span] + pub span: Span, + #[subdiagnostic] + pub sugg: WrapInParentheses, +} + +#[derive(Diagnostic)] #[diag(parse_missing_in_in_for_loop)] pub(crate) struct MissingInInForLoop { #[primary_span] |