Skip to content

Commit dd0d8cd

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #122776 - GuillaumeGomez:rename-hir-let, r=oli-obk
Rename `hir::Let` into `hir::LetExpr` As discussed on [zulip](https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Improve.20naming.20of.20.60ExprKind.3A.3ALet.60.3F). r? ``@Zalathar``
2 parents b2d78a9 + 98e6655 commit dd0d8cd

File tree

14 files changed

+27
-23
lines changed

14 files changed

+27
-23
lines changed

‎compiler/rustc_ast_lowering/src/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
157157
hir::ExprKind::AddrOf(*k, *m, ohs)
158158
}
159159
ExprKind::Let(pat, scrutinee, span, is_recovered) => {
160-
hir::ExprKind::Let(self.arena.alloc(hir::Let {
160+
hir::ExprKind::Let(self.arena.alloc(hir::LetExpr {
161161
span: self.lower_span(*span),
162162
pat: self.lower_pat(pat),
163163
ty: None,

‎compiler/rustc_hir/src/hir.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ pub struct Arm<'hir> {
12591259
/// In an `if let`, imagine it as `if (let <pat> = <expr>) { ... }`; in a let-else, it is part of
12601260
/// the desugaring to if-let. Only let-else supports the type annotation at present.
12611261
#[derive(Debug, Clone, Copy, HashStable_Generic)]
1262-
pub struct Let<'hir> {
1262+
pub struct LetExpr<'hir> {
12631263
pub span: Span,
12641264
pub pat: &'hir Pat<'hir>,
12651265
pub ty: Option<&'hir Ty<'hir>>,
@@ -1852,7 +1852,7 @@ pub enum ExprKind<'hir> {
18521852
///
18531853
/// These are not `Local` and only occur as expressions.
18541854
/// The `let Some(x) = foo()` in `if let Some(x) = foo()` is an example of `Let(..)`.
1855-
Let(&'hir Let<'hir>),
1855+
Let(&'hir LetExpr<'hir>),
18561856
/// An `if` block, with an optional else block.
18571857
///
18581858
/// I.e., `if <expr> { <expr> } else { <expr> }`.

‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>)
753753
ExprKind::DropTemps(ref subexpression) => {
754754
try_visit!(visitor.visit_expr(subexpression));
755755
}
756-
ExprKind::Let(Let { span: _, pat, ty, init, is_recovered: _ }) => {
756+
ExprKind::Let(LetExpr { span: _, pat, ty, init, is_recovered: _ }) => {
757757
// match the visit order in walk_local
758758
try_visit!(visitor.visit_expr(init));
759759
try_visit!(visitor.visit_pat(pat));

‎compiler/rustc_hir_pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ impl<'a> State<'a> {
13871387
// Print `}`:
13881388
self.bclose_maybe_open(expr.span, true);
13891389
}
1390-
hir::ExprKind::Let(&hir::Let { pat, ty, init, .. }) => {
1390+
hir::ExprKind::Let(&hir::LetExpr { pat, ty, init, .. }) => {
13911391
self.print_let(pat, ty, init);
13921392
}
13931393
hir::ExprKind::If(test, blk, elseopt) => {

‎compiler/rustc_hir_typeck/src/_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
317317
err.note("`if` expressions without `else` evaluate to `()`");
318318
err.help("consider adding an `else` block that evaluates to the expected type");
319319
*error = true;
320-
if let ExprKind::Let(hir::Let { span, pat, init, .. }) = cond_expr.kind
320+
if let ExprKind::Let(hir::LetExpr { span, pat, init, .. }) = cond_expr.kind
321321
&& let ExprKind::Block(block, _) = then_expr.kind
322322
// Refutability checks occur on the MIR, so we approximate it here by checking
323323
// if we have an enum with a single variant or a struct in the pattern.

‎compiler/rustc_hir_typeck/src/expr.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
12611261
}
12621262
}
12631263

1264-
pub(super) fn check_expr_let(&self, let_expr: &'tcx hir::Let<'tcx>, hir_id: HirId) -> Ty<'tcx> {
1264+
pub(super) fn check_expr_let(
1265+
&self,
1266+
let_expr: &'tcx hir::LetExpr<'tcx>,
1267+
hir_id: HirId,
1268+
) -> Ty<'tcx> {
12651269
// for let statements, this is done in check_stmt
12661270
let init = let_expr.init;
12671271
self.warn_if_unreachable(init.hir_id, init.span, "block in `let` expression");

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
245245
}
246246
}
247247

248-
hir::ExprKind::Let(hir::Let { pat, init, .. }) => {
248+
hir::ExprKind::Let(hir::LetExpr { pat, init, .. }) => {
249249
self.walk_local(init, pat, None, |t| t.borrow_expr(init, ty::ImmBorrow))
250250
}
251251

‎compiler/rustc_hir_typeck/src/gather_locals.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<'a> DeclOrigin<'a> {
2929
}
3030
}
3131

32-
/// A declaration is an abstraction of [hir::Local] and [hir::Let].
32+
/// A declaration is an abstraction of [hir::Local] and [hir::LetExpr].
3333
///
3434
/// It must have a hir_id, as this is how we connect gather_locals to the check functions.
3535
pub(super) struct Declaration<'a> {
@@ -48,9 +48,9 @@ impl<'a> From<&'a hir::Local<'a>> for Declaration<'a> {
4848
}
4949
}
5050

51-
impl<'a> From<(&'a hir::Let<'a>, hir::HirId)> for Declaration<'a> {
52-
fn from((let_expr, hir_id): (&'a hir::Let<'a>, hir::HirId)) -> Self {
53-
let hir::Let { pat, ty, span, init, is_recovered: _ } = *let_expr;
51+
impl<'a> From<(&'a hir::LetExpr<'a>, hir::HirId)> for Declaration<'a> {
52+
fn from((let_expr, hir_id): (&'a hir::LetExpr<'a>, hir::HirId)) -> Self {
53+
let hir::LetExpr { pat, ty, span, init, is_recovered: _ } = *let_expr;
5454
Declaration { hir_id, pat, ty, span, init: Some(init), origin: DeclOrigin::LetExpr }
5555
}
5656
}

‎src/tools/clippy/clippy_lints/src/pattern_type_mismatch.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
2-
use rustc_hir::{intravisit, Body, Expr, ExprKind, FnDecl, Let, LocalSource, Mutability, Pat, PatKind, Stmt, StmtKind};
2+
use rustc_hir::{intravisit, Body, Expr, ExprKind, FnDecl, LetExpr, LocalSource, Mutability, Pat, PatKind, Stmt, StmtKind};
33
use rustc_lint::{LateContext, LateLintPass, LintContext};
44
use rustc_middle::lint::in_external_macro;
55
use rustc_middle::ty;
@@ -103,7 +103,7 @@ impl<'tcx> LateLintPass<'tcx> for PatternTypeMismatch {
103103
}
104104
}
105105
}
106-
if let ExprKind::Let(Let { pat, .. }) = expr.kind {
106+
if let ExprKind::Let(LetExpr { pat, .. }) = expr.kind {
107107
apply_lint(cx, pat, DerefPossible::Possible);
108108
}
109109
}

‎src/tools/clippy/clippy_lints/src/shadow.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_data_structures::fx::FxHashMap;
55
use rustc_hir::def::Res;
66
use rustc_hir::def_id::LocalDefId;
77
use rustc_hir::hir_id::ItemLocalId;
8-
use rustc_hir::{Block, Body, BodyOwnerKind, Expr, ExprKind, HirId, Let, Node, Pat, PatKind, QPath, UnOp};
8+
use rustc_hir::{Block, Body, BodyOwnerKind, Expr, ExprKind, HirId, LetExpr, Node, Pat, PatKind, QPath, UnOp};
99
use rustc_lint::{LateContext, LateLintPass};
1010
use rustc_session::impl_lint_pass;
1111
use rustc_span::{Span, Symbol};
@@ -238,7 +238,7 @@ fn find_init<'tcx>(cx: &LateContext<'tcx>, hir_id: HirId) -> Option<&'tcx Expr<'
238238
let init = match node {
239239
Node::Arm(_) | Node::Pat(_) => continue,
240240
Node::Expr(expr) => match expr.kind {
241-
ExprKind::Match(e, _, _) | ExprKind::Let(&Let { init: e, .. }) => Some(e),
241+
ExprKind::Match(e, _, _) | ExprKind::Let(&LetExpr { init: e, .. }) => Some(e),
242242
_ => None,
243243
},
244244
Node::Local(local) => local.init,

‎src/tools/clippy/clippy_lints/src/unused_io_amount.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fn non_consuming_ok_arm<'a>(cx: &LateContext<'a>, arm: &hir::Arm<'a>) -> bool {
131131
fn check_expr<'a>(cx: &LateContext<'a>, expr: &'a hir::Expr<'a>) {
132132
match expr.kind {
133133
hir::ExprKind::If(cond, _, _)
134-
if let ExprKind::Let(hir::Let { pat, init, .. }) = cond.kind
134+
if let ExprKind::Let(hir::LetExpr { pat, init, .. }) = cond.kind
135135
&& is_ok_wild_or_dotdot_pattern(cx, pat)
136136
&& let Some(op) = should_lint(cx, init) =>
137137
{

‎src/tools/clippy/clippy_utils/src/higher.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl<'hir> IfLet<'hir> {
102102
if let ExprKind::If(
103103
Expr {
104104
kind:
105-
ExprKind::Let(&hir::Let {
105+
ExprKind::Let(&hir::LetExpr {
106106
pat: let_pat,
107107
init: let_expr,
108108
span: let_span,
@@ -379,7 +379,7 @@ impl<'hir> WhileLet<'hir> {
379379
ExprKind::If(
380380
Expr {
381381
kind:
382-
ExprKind::Let(&hir::Let {
382+
ExprKind::Let(&hir::LetExpr {
383383
pat: let_pat,
384384
init: let_expr,
385385
span: let_span,

‎src/tools/clippy/clippy_utils/src/hir_utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_hir::def::Res;
88
use rustc_hir::MatchSource::TryDesugar;
99
use rustc_hir::{
1010
ArrayLen, BinOpKind, BindingAnnotation, Block, BodyId, Closure, Expr, ExprField, ExprKind, FnRetTy, GenericArg,
11-
GenericArgs, HirId, HirIdMap, InlineAsmOperand, Let, Lifetime, LifetimeName, Pat, PatField, PatKind, Path,
11+
GenericArgs, HirId, HirIdMap, InlineAsmOperand, LetExpr, Lifetime, LifetimeName, Pat, PatField, PatKind, Path,
1212
PathSegment, PrimTy, QPath, Stmt, StmtKind, Ty, TyKind, TypeBinding,
1313
};
1414
use rustc_lexer::{tokenize, TokenKind};
@@ -837,7 +837,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
837837
}
838838
}
839839
},
840-
ExprKind::Let(Let { pat, init, ty, .. }) => {
840+
ExprKind::Let(LetExpr { pat, init, ty, .. }) => {
841841
self.hash_expr(init);
842842
if let Some(ty) = ty {
843843
self.hash_ty(ty);

‎src/tools/clippy/clippy_utils/src/visitors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_hir as hir;
55
use rustc_hir::def::{CtorKind, DefKind, Res};
66
use rustc_hir::intravisit::{self, walk_block, walk_expr, Visitor};
77
use rustc_hir::{
8-
AnonConst, Arm, Block, BlockCheckMode, Body, BodyId, Expr, ExprKind, HirId, ItemId, ItemKind, Let, Pat, QPath,
8+
AnonConst, Arm, Block, BlockCheckMode, Body, BodyId, Expr, ExprKind, HirId, ItemId, ItemKind, LetExpr, Pat, QPath,
99
Stmt, UnOp, UnsafeSource, Unsafety,
1010
};
1111
use rustc_lint::LateContext;
@@ -624,7 +624,7 @@ pub fn for_each_unconsumed_temporary<'tcx, B>(
624624
| ExprKind::Field(e, _)
625625
| ExprKind::Unary(UnOp::Deref, e)
626626
| ExprKind::Match(e, ..)
627-
| ExprKind::Let(&Let { init: e, .. }) => {
627+
| ExprKind::Let(&LetExpr { init: e, .. }) => {
628628
helper(typeck, false, e, f)?;
629629
},
630630
ExprKind::Block(&Block { expr: Some(e), .. }, _) | ExprKind::Cast(e, _) | ExprKind::Unary(_, e) => {

0 commit comments

Comments
 (0)