diff options
| author | bors <bors@rust-lang.org> | 2023-09-14 19:56:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-14 19:56:55 +0000 |
| commit | dac91a82e146d89fefe94dcbb53cd6c2662e354f (patch) | |
| tree | b17e0f57c57a47fb6d4b54df4313174f090ee4e3 /compiler/rustc_parse/src/errors.rs | |
| parent | ccf817b9bbe449204a227430d0a84a4f1d1798cc (diff) | |
| parent | e324a59eb6ba1a7883bf23ff42d425ca96960f2a (diff) | |
| download | rust-dac91a82e146d89fefe94dcbb53cd6c2662e354f.tar.gz rust-dac91a82e146d89fefe94dcbb53cd6c2662e354f.zip | |
Auto merge of #115677 - matthewjasper:let-expr-recovery, r=b-naber
Improve invalid let expression handling - Move all of the checks for valid let expression positions to parsing. - Add a field to ExprKind::Let in AST/HIR to mark whether it's in a valid location. - Suppress some later errors and MIR construction for invalid let expressions. - Fix a (drop) scope issue that was also responsible for #104172. Fixes #104172 Fixes #104868
Diffstat (limited to 'compiler/rustc_parse/src/errors.rs')
| -rw-r--r-- | compiler/rustc_parse/src/errors.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/errors.rs b/compiler/rustc_parse/src/errors.rs index e0b1e3678e4..5d3ec683552 100644 --- a/compiler/rustc_parse/src/errors.rs +++ b/compiler/rustc_parse/src/errors.rs @@ -10,7 +10,7 @@ use rustc_span::symbol::Ident; use rustc_span::{Span, Symbol}; use crate::fluent_generated as fluent; -use crate::parser::TokenDescription; +use crate::parser::{ForbiddenLetReason, TokenDescription}; #[derive(Diagnostic)] #[diag(parse_maybe_report_ambiguous_plus)] @@ -392,9 +392,12 @@ pub(crate) struct IfExpressionMissingCondition { #[derive(Diagnostic)] #[diag(parse_expected_expression_found_let)] +#[note] pub(crate) struct ExpectedExpressionFoundLet { #[primary_span] pub span: Span, + #[subdiagnostic] + pub reason: ForbiddenLetReason, } #[derive(Diagnostic)] |