Rollup merge of #107190 - fmease:fix-81698, r=compiler-errors
Recover from more const arguments that are not wrapped in curly braces Recover from some array, borrow, tuple & arithmetic expressions in const argument positions that lack curly braces and provide a suggestion to fix the issue continuing where #92884 left off. Examples of such expressions: `[]`, `[0]`, `[1, 2]`, `[0; 0xff]`, `&9`, `("", 0)` and `(1 + 2) * 3` (we previously did not recover from them). I am not entirely happy with my current solution because the code that recovers from `[0]` (coinciding with a malformed slice type) and `[0; 0]` (coinciding with a malformed array type) is quite fragile as the aforementioned snippets are actually successfully parsed as types by `parse_ty` since it itself already recovers from them (returning `[⟨error⟩]` and `[⟨error⟩; 0]` respectively) meaning I have to manually look for `TyKind::Err`s and construct a separate diagnostic for the suggestion to attach to (thereby emitting two diagnostics in total). Fixes #81698. `@rustbot` label A-diagnostics r? diagnostics
This commit is contained in:
commit
260e04879e
4 changed files with 188 additions and 22 deletions
|
@ -2353,6 +2353,28 @@ impl<'a> Parser<'a> {
|
|||
Err(err)
|
||||
}
|
||||
|
||||
/// Try to recover from an unbraced const argument whose first token [could begin a type][ty].
|
||||
///
|
||||
/// [ty]: token::Token::can_begin_type
|
||||
pub(crate) fn recover_unbraced_const_arg_that_can_begin_ty(
|
||||
&mut self,
|
||||
mut snapshot: SnapshotParser<'a>,
|
||||
) -> Option<P<ast::Expr>> {
|
||||
match snapshot.parse_expr_res(Restrictions::CONST_EXPR, None) {
|
||||
// Since we don't know the exact reason why we failed to parse the type or the
|
||||
// expression, employ a simple heuristic to weed out some pathological cases.
|
||||
Ok(expr) if let token::Comma | token::Gt = snapshot.token.kind => {
|
||||
self.restore_snapshot(snapshot);
|
||||
Some(expr)
|
||||
}
|
||||
Ok(_) => None,
|
||||
Err(err) => {
|
||||
err.cancel();
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a dummy const argument, and reports that the expression must be enclosed in braces
|
||||
pub fn dummy_const_arg_needs_braces(
|
||||
&self,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue