Move let expression checking to parsing
There was an incomplete version of the check in parsing and a second version in AST validation. This meant that some, but not all, invalid uses were allowed inside macros/disabled cfgs. It also means that later passes have a hard time knowing when the let expression is in a valid location, sometimes causing ICEs. - Add a field to ExprKind::Let in AST/HIR to mark whether it's in a valid location. - Suppress later errors and MIR construction for invalid let expressions.
This commit is contained in:
parent
7b61f7f002
commit
333388fd3c
40 changed files with 915 additions and 2246 deletions
|
@ -33,7 +33,7 @@ use rustc_macros::HashStable_Generic;
|
|||
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
|
||||
use rustc_span::source_map::{respan, Spanned};
|
||||
use rustc_span::symbol::{kw, sym, Ident, Symbol};
|
||||
use rustc_span::{Span, DUMMY_SP};
|
||||
use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP};
|
||||
use std::fmt;
|
||||
use std::mem;
|
||||
use thin_vec::{thin_vec, ThinVec};
|
||||
|
@ -1426,7 +1426,7 @@ pub enum ExprKind {
|
|||
/// of `if` / `while` expressions. (e.g., `if let 0 = x { .. }`).
|
||||
///
|
||||
/// `Span` represents the whole `let pat = expr` statement.
|
||||
Let(P<Pat>, P<Expr>, Span),
|
||||
Let(P<Pat>, P<Expr>, Span, Option<ErrorGuaranteed>),
|
||||
/// An `if` block, with an optional `else` block.
|
||||
///
|
||||
/// `if expr { block } else { expr }`
|
||||
|
|
|
@ -1366,7 +1366,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
|
|||
vis.visit_ty(ty);
|
||||
}
|
||||
ExprKind::AddrOf(_, _, ohs) => vis.visit_expr(ohs),
|
||||
ExprKind::Let(pat, scrutinee, _) => {
|
||||
ExprKind::Let(pat, scrutinee, _, _) => {
|
||||
vis.visit_pat(pat);
|
||||
vis.visit_expr(scrutinee);
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ pub fn expr_trailing_brace(mut expr: &ast::Expr) -> Option<&ast::Expr> {
|
|||
| AssignOp(_, _, e)
|
||||
| Binary(_, _, e)
|
||||
| Break(_, Some(e))
|
||||
| Let(_, e, _)
|
||||
| Let(_, e, _, _)
|
||||
| Range(_, Some(e), _)
|
||||
| Ret(Some(e))
|
||||
| Unary(_, e)
|
||||
|
|
|
@ -827,7 +827,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
|
|||
visitor.visit_expr(subexpression);
|
||||
visitor.visit_ty(typ)
|
||||
}
|
||||
ExprKind::Let(pat, expr, _) => {
|
||||
ExprKind::Let(pat, expr, _, _) => {
|
||||
visitor.visit_pat(pat);
|
||||
visitor.visit_expr(expr);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue