bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove error recovery todos

Browse source
This commit is contained in:
Noah Lev 2022-02-15 19:59:04 -08:00
parent c9cc43aa66
commit d915606d50
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -1294,8 +1294,8 @@ impl<'a> Parser<'a> {
fn prefix_inc_dec_suggest_and_recover( fn prefix_inc_dec_suggest_and_recover(
&mut self, &mut self,
base: P<Expr>, _base: P<Expr>,
mut err: DiagnosticBuilder<'_>, mut err: DiagnosticBuilder<'a>,
kind: IncDecRecovery, kind: IncDecRecovery,
ident: Ident, ident: Ident,
(pre_span, post_span): (Span, Span), (pre_span, post_span): (Span, Span),
@ -1308,15 +1308,13 @@ impl<'a> Parser<'a> {
], ],
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
err.emit(); Err(err)
// TODO: recover
Ok(base)
} }
fn postfix_inc_dec_suggest_and_recover( fn postfix_inc_dec_suggest_and_recover(
&mut self, &mut self,
base: P<Expr>, _base: P<Expr>,
mut err: DiagnosticBuilder<'_>, mut err: DiagnosticBuilder<'a>,
kind: IncDecRecovery, kind: IncDecRecovery,
ident: Ident, ident: Ident,
(pre_span, post_span): (Span, Span), (pre_span, post_span): (Span, Span),
@ -1329,15 +1327,13 @@ impl<'a> Parser<'a> {
], ],
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
err.emit(); Err(err)
// TODO: recover
Ok(base)
} }
fn inc_dec_standalone_recovery( fn inc_dec_standalone_recovery(
&mut self, &mut self,
base: P<Expr>, _base: P<Expr>,
mut err: DiagnosticBuilder<'_>, mut err: DiagnosticBuilder<'a>,
kind: IncDecRecovery, kind: IncDecRecovery,
_ident: Ident, _ident: Ident,
(pre_span, post_span): (Span, Span), (pre_span, post_span): (Span, Span),
@ -1347,9 +1343,7 @@ impl<'a> Parser<'a> {
vec![(pre_span, String::new()), (post_span, format!(" {}= 1", kind.op.chr()))], vec![(pre_span, String::new()), (post_span, format!(" {}= 1", kind.op.chr()))],
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
err.emit(); Err(err)
// TODO: recover
Ok(base)
} }
/// Tries to recover from associated item paths like `[T]::AssocItem` / `(T, U)::AssocItem`. /// Tries to recover from associated item paths like `[T]::AssocItem` / `(T, U)::AssocItem`.