diff options
| author | bors <bors@rust-lang.org> | 2024-03-29 06:16:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-29 06:16:56 +0000 |
| commit | eae940fcef7f95d31b566f92f511f91f24f2f703 (patch) | |
| tree | a5635c4d1821e9114fe7cc27d00353f98cac5402 /compiler/rustc_parse/src/errors.rs | |
| parent | 58a771ebfa2e59f48cb50229049487c6550b2f7b (diff) | |
| parent | ed29546a27db9fa024c6f99a7dd001e86d75e14f (diff) | |
| download | rust-eae940fcef7f95d31b566f92f511f91f24f2f703.tar.gz rust-eae940fcef7f95d31b566f92f511f91f24f2f703.zip | |
Auto merge of #3427 - rust-lang:rustup-2024-03-29, r=saethlin
Automatic Rustup
Diffstat (limited to 'compiler/rustc_parse/src/errors.rs')
| -rw-r--r-- | compiler/rustc_parse/src/errors.rs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/compiler/rustc_parse/src/errors.rs b/compiler/rustc_parse/src/errors.rs index 20ebfc6691b..a6eedabf689 100644 --- a/compiler/rustc_parse/src/errors.rs +++ b/compiler/rustc_parse/src/errors.rs @@ -2631,13 +2631,22 @@ pub(crate) struct GenericsInPath { } #[derive(Diagnostic)] -#[diag(parse_assoc_lifetime)] +#[diag(parse_lifetime_in_eq_constraint)] #[help] -pub(crate) struct AssocLifetime { +pub(crate) struct LifetimeInEqConstraint { #[primary_span] - pub span: Span, #[label] - pub lifetime: Span, + pub span: Span, + pub lifetime: Ident, + #[label(parse_context_label)] + pub binding_label: Span, + #[suggestion( + parse_colon_sugg, + style = "verbose", + applicability = "maybe-incorrect", + code = ": " + )] + pub colon_sugg: Span, } #[derive(Diagnostic)] |
