Skip to content

Commit 5595138

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#122487
Rollup merge of rust-lang#122487 - GuillaumeGomez:rename-stmtkind-local, r=oli-obk Rename `StmtKind::Local` variant into `StmtKind::Let` It comes from this [discussion](https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Improve.20naming.20of.20.60ExprKind.3A.3ALet.60.3F). Starting point was: > I often end up looking at [ExprKind::Let](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/enum.ExprKind.html#variant.Let) instead of Local because of the name. I think renaming it (both the `ExprKind` variant and the Let struct) to `LetPattern` or LetPat could improve the situation as I'm not sure I'm not the only one encountering this issue. And then it evolved into: > It's already `Expr::Let` instead of `StmtKind::Local`. Counterproposal: rename `StmtKind::Local` to `StmtKind::Let`. The goal here is to clear this confusion. r? `@oli-obk`
2 parents f4b771b + ac1b857 commit 5595138

File tree

74 files changed

+103
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+103
-103
lines changed

‎compiler/rustc_ast/src/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ impl Stmt {
10211021
#[derive(Clone, Encodable, Decodable, Debug)]
10221022
pub enum StmtKind {
10231023
/// A local (let) binding.
1024-
Local(P<Local>),
1024+
Let(P<Local>),
10251025
/// An item definition.
10261026
Item(P<Item>),
10271027
/// Expr without trailing semi-colon.

‎compiler/rustc_ast/src/ast_traits.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<T: HasTokens> HasTokens for Option<T> {
182182
impl HasTokens for StmtKind {
183183
fn tokens(&self) -> Option<&LazyAttrTokenStream> {
184184
match self {
185-
StmtKind::Local(local) => local.tokens.as_ref(),
185+
StmtKind::Let(local) => local.tokens.as_ref(),
186186
StmtKind::Item(item) => item.tokens(),
187187
StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr.tokens(),
188188
StmtKind::Empty => return None,
@@ -191,7 +191,7 @@ impl HasTokens for StmtKind {
191191
}
192192
fn tokens_mut(&mut self) -> Option<&mut Option<LazyAttrTokenStream>> {
193193
match self {
194-
StmtKind::Local(local) => Some(&mut local.tokens),
194+
StmtKind::Let(local) => Some(&mut local.tokens),
195195
StmtKind::Item(item) => item.tokens_mut(),
196196
StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr.tokens_mut(),
197197
StmtKind::Empty => return None,
@@ -355,7 +355,7 @@ impl HasAttrs for StmtKind {
355355

356356
fn attrs(&self) -> &[Attribute] {
357357
match self {
358-
StmtKind::Local(local) => &local.attrs,
358+
StmtKind::Let(local) => &local.attrs,
359359
StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr.attrs(),
360360
StmtKind::Item(item) => item.attrs(),
361361
StmtKind::Empty => &[],
@@ -365,7 +365,7 @@ impl HasAttrs for StmtKind {
365365

366366
fn visit_attrs(&mut self, f: impl FnOnce(&mut AttrVec)) {
367367
match self {
368-
StmtKind::Local(local) => f(&mut local.attrs),
368+
StmtKind::Let(local) => f(&mut local.attrs),
369369
StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr.visit_attrs(f),
370370
StmtKind::Item(item) => item.visit_attrs(f),
371371
StmtKind::Empty => {}

‎compiler/rustc_ast/src/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(
15671567
vis: &mut T,
15681568
) -> SmallVec<[StmtKind; 1]> {
15691569
match kind {
1570-
StmtKind::Local(mut local) => smallvec![StmtKind::Local({
1570+
StmtKind::Let(mut local) => smallvec![StmtKind::Let({
15711571
vis.visit_local(&mut local);
15721572
local
15731573
})],

‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ pub fn walk_block<'a, V: Visitor<'a>>(visitor: &mut V, block: &'a Block) -> V::R
787787

788788
pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) -> V::Result {
789789
match &statement.kind {
790-
StmtKind::Local(local) => try_visit!(visitor.visit_local(local)),
790+
StmtKind::Let(local) => try_visit!(visitor.visit_local(local)),
791791
StmtKind::Item(item) => try_visit!(visitor.visit_item(item)),
792792
StmtKind::Expr(expr) | StmtKind::Semi(expr) => try_visit!(visitor.visit_expr(expr)),
793793
StmtKind::Empty => {}

‎compiler/rustc_ast_lowering/src/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
3232
let mut expr = None;
3333
while let [s, tail @ ..] = ast_stmts {
3434
match &s.kind {
35-
StmtKind::Local(local) => {
35+
StmtKind::Let(local) => {
3636
let hir_id = self.lower_node_id(s.id);
3737
let local = self.lower_local(local);
3838
self.alias_attrs(hir_id, local.hir_id);
39-
let kind = hir::StmtKind::Local(local);
39+
let kind = hir::StmtKind::Let(local);
4040
let span = self.lower_span(s.span);
4141
stmts.push(hir::Stmt { hir_id, kind, span });
4242
}

‎compiler/rustc_ast_lowering/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2356,7 +2356,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23562356
span: self.lower_span(span),
23572357
ty: None,
23582358
};
2359-
self.stmt(span, hir::StmtKind::Local(self.arena.alloc(local)))
2359+
self.stmt(span, hir::StmtKind::Let(self.arena.alloc(local)))
23602360
}
23612361

23622362
fn block_expr(&mut self, expr: &'hir hir::Expr<'hir>) -> &'hir hir::Block<'hir> {

‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ impl<'a> State<'a> {
12121212
fn print_stmt(&mut self, st: &ast::Stmt) {
12131213
self.maybe_print_comment(st.span.lo());
12141214
match &st.kind {
1215-
ast::StmtKind::Local(loc) => {
1215+
ast::StmtKind::Let(loc) => {
12161216
self.print_outer_attributes(&loc.attrs);
12171217
self.space_if_not_bol();
12181218
self.ibox(INDENT_UNIT);

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
616616

617617
// FIXME: We make sure that this is a normal top-level binding,
618618
// but we could suggest `todo!()` for all uninitalized bindings in the pattern pattern
619-
if let hir::StmtKind::Local(hir::Local { span, ty, init: None, pat, .. }) =
619+
if let hir::StmtKind::Let(hir::Local { span, ty, init: None, pat, .. }) =
620620
&ex.kind
621621
&& let hir::PatKind::Binding(..) = pat.kind
622622
&& span.contains(self.decl_span)

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
558558
hir::intravisit::walk_stmt(self, stmt);
559559
let expr = match stmt.kind {
560560
hir::StmtKind::Semi(expr) | hir::StmtKind::Expr(expr) => expr,
561-
hir::StmtKind::Local(hir::Local { init: Some(expr), .. }) => expr,
561+
hir::StmtKind::Let(hir::Local { init: Some(expr), .. }) => expr,
562562
_ => {
563563
return;
564564
}
@@ -1305,7 +1305,7 @@ struct BindingFinder {
13051305
impl<'tcx> Visitor<'tcx> for BindingFinder {
13061306
type Result = ControlFlow<hir::HirId>;
13071307
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) -> Self::Result {
1308-
if let hir::StmtKind::Local(local) = s.kind
1308+
if let hir::StmtKind::Let(local) = s.kind
13091309
&& local.pat.span == self.span
13101310
{
13111311
ControlFlow::Break(local.hir_id)

‎compiler/rustc_expand/src/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl<'a> ExtCtxt<'a> {
218218
}
219219

220220
pub fn stmt_local(&self, local: P<ast::Local>, span: Span) -> ast::Stmt {
221-
ast::Stmt { id: ast::DUMMY_NODE_ID, kind: ast::StmtKind::Local(local), span }
221+
ast::Stmt { id: ast::DUMMY_NODE_ID, kind: ast::StmtKind::Let(local), span }
222222
}
223223

224224
pub fn stmt_item(&self, sp: Span, item: P<ast::Item>) -> ast::Stmt {

‎compiler/rustc_expand/src/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ impl InvocationCollectorNode for ast::Stmt {
13891389
StmtKind::Item(item) => matches!(item.kind, ItemKind::MacCall(..)),
13901390
StmtKind::Semi(expr) => matches!(expr.kind, ExprKind::MacCall(..)),
13911391
StmtKind::Expr(..) => unreachable!(),
1392-
StmtKind::Local(..) | StmtKind::Empty => false,
1392+
StmtKind::Let(..) | StmtKind::Empty => false,
13931393
}
13941394
}
13951395
fn take_mac_call(self) -> (P<ast::MacCall>, Self::AttrsTy, AddSemicolon) {

‎compiler/rustc_hir/src/hir.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ pub struct Stmt<'hir> {
12091209
#[derive(Debug, Clone, Copy, HashStable_Generic)]
12101210
pub enum StmtKind<'hir> {
12111211
/// A local (`let`) binding.
1212-
Local(&'hir Local<'hir>),
1212+
Let(&'hir Local<'hir>),
12131213

12141214
/// An item binding.
12151215
Item(ItemId),

‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ pub fn walk_block<'v, V: Visitor<'v>>(visitor: &mut V, block: &'v Block<'v>) ->
627627
pub fn walk_stmt<'v, V: Visitor<'v>>(visitor: &mut V, statement: &'v Stmt<'v>) -> V::Result {
628628
try_visit!(visitor.visit_id(statement.hir_id));
629629
match statement.kind {
630-
StmtKind::Local(ref local) => visitor.visit_local(local),
630+
StmtKind::Let(ref local) => visitor.visit_local(local),
631631
StmtKind::Item(item) => visitor.visit_nested_item(item),
632632
StmtKind::Expr(ref expression) | StmtKind::Semi(ref expression) => {
633633
visitor.visit_expr(expression)

‎compiler/rustc_hir_analysis/src/check/errs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub fn maybe_expr_static_mut(tcx: TyCtxt<'_>, expr: hir::Expr<'_>) {
2727

2828
/// Check for shared or mutable references of `static mut` inside statement
2929
pub fn maybe_stmt_static_mut(tcx: TyCtxt<'_>, stmt: hir::Stmt<'_>) {
30-
if let hir::StmtKind::Local(loc) = stmt.kind
30+
if let hir::StmtKind::Let(loc) = stmt.kind
3131
&& let hir::PatKind::Binding(ba, _, _, _) = loc.pat.kind
3232
&& matches!(ba.0, rustc_ast::ByRef::Yes)
3333
&& let Some(init) = loc.init

‎compiler/rustc_hir_analysis/src/check/region.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h
123123

124124
for (i, statement) in blk.stmts.iter().enumerate() {
125125
match statement.kind {
126-
hir::StmtKind::Local(hir::Local { els: Some(els), .. }) => {
126+
hir::StmtKind::Let(hir::Local { els: Some(els), .. }) => {
127127
// Let-else has a special lexical structure for variables.
128128
// First we take a checkpoint of the current scope context here.
129129
let mut prev_cx = visitor.cx;
@@ -146,7 +146,7 @@ fn resolve_block<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, blk: &'tcx h
146146
// From now on, we continue normally.
147147
visitor.cx = prev_cx;
148148
}
149-
hir::StmtKind::Local(..) => {
149+
hir::StmtKind::Let(..) => {
150150
// Each declaration introduces a subscope for bindings
151151
// introduced by the declaration; this subscope covers a
152152
// suffix of the block. Each subscope in a block has the

‎compiler/rustc_hir_pretty/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ impl<'a> State<'a> {
864864
fn print_stmt(&mut self, st: &hir::Stmt<'_>) {
865865
self.maybe_print_comment(st.span.lo());
866866
match st.kind {
867-
hir::StmtKind::Local(loc) => {
867+
hir::StmtKind::Let(loc) => {
868868
self.print_local(loc.init, loc.els, |this| this.print_local_decl(loc));
869869
}
870870
hir::StmtKind::Item(item) => self.ann.nested(self, Nested::Item(item)),
@@ -2307,7 +2307,7 @@ fn expr_requires_semi_to_be_stmt(e: &hir::Expr<'_>) -> bool {
23072307
/// seen the semicolon, and thus don't need another.
23082308
fn stmt_ends_with_semi(stmt: &hir::StmtKind<'_>) -> bool {
23092309
match *stmt {
2310-
hir::StmtKind::Local(_) => true,
2310+
hir::StmtKind::Let(_) => true,
23112311
hir::StmtKind::Item(_) => false,
23122312
hir::StmtKind::Expr(e) => expr_requires_semi_to_be_stmt(e),
23132313
hir::StmtKind::Semi(..) => false,

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,11 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
371371

372372
fn walk_stmt(&mut self, stmt: &hir::Stmt<'_>) {
373373
match stmt.kind {
374-
hir::StmtKind::Local(hir::Local { pat, init: Some(expr), els, .. }) => {
374+
hir::StmtKind::Let(hir::Local { pat, init: Some(expr), els, .. }) => {
375375
self.walk_local(expr, pat, *els, |_| {})
376376
}
377377

378-
hir::StmtKind::Local(_) => {}
378+
hir::StmtKind::Let(_) => {}
379379

380380
hir::StmtKind::Item(_) => {
381381
// We don't visit nested items in this visitor,

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
15931593
// Don't do all the complex logic below for `DeclItem`.
15941594
match stmt.kind {
15951595
hir::StmtKind::Item(..) => return,
1596-
hir::StmtKind::Local(..) | hir::StmtKind::Expr(..) | hir::StmtKind::Semi(..) => {}
1596+
hir::StmtKind::Let(..) | hir::StmtKind::Expr(..) | hir::StmtKind::Semi(..) => {}
15971597
}
15981598

15991599
self.warn_if_unreachable(stmt.hir_id, stmt.span, "statement");
@@ -1602,7 +1602,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
16021602
let old_diverges = self.diverges.replace(Diverges::Maybe);
16031603

16041604
match stmt.kind {
1605-
hir::StmtKind::Local(l) => {
1605+
hir::StmtKind::Let(l) => {
16061606
self.check_decl_local(l);
16071607
}
16081608
// Ignore for now.
@@ -1765,7 +1765,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
17651765
[
17661766
hir::Stmt {
17671767
kind:
1768-
hir::StmtKind::Local(hir::Local {
1768+
hir::StmtKind::Let(hir::Local {
17691769
source:
17701770
hir::LocalSource::AssignDesugar(_),
17711771
..

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
15991599

16001600
fn is_local_statement(&self, id: hir::HirId) -> bool {
16011601
let node = self.tcx.hir_node(id);
1602-
matches!(node, Node::Stmt(Stmt { kind: StmtKind::Local(..), .. }))
1602+
matches!(node, Node::Stmt(Stmt { kind: StmtKind::Let(..), .. }))
16031603
}
16041604

16051605
/// Suggest that `&T` was cloned instead of `T` because `T` does not implement `Clone`,

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2221,7 +2221,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22212221
impl<'v> Visitor<'v> for LetVisitor {
22222222
type Result = ControlFlow<Option<&'v hir::Expr<'v>>>;
22232223
fn visit_stmt(&mut self, ex: &'v hir::Stmt<'v>) -> Self::Result {
2224-
if let hir::StmtKind::Local(&hir::Local { pat, init, .. }) = ex.kind
2224+
if let hir::StmtKind::Let(&hir::Local { pat, init, .. }) = ex.kind
22252225
&& let Binding(_, _, ident, ..) = pat.kind
22262226
&& ident.name == self.ident_name
22272227
{

‎compiler/rustc_hir_typeck/src/upvar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
217217
bug!();
218218
};
219219
for stmt in block.stmts {
220-
let hir::StmtKind::Local(hir::Local {
220+
let hir::StmtKind::Let(hir::Local {
221221
init: Some(init),
222222
source: hir::LocalSource::AsyncFn,
223223
pat,

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2139,7 +2139,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
21392139
// the same span as the error and the type is specified.
21402140
if let hir::Stmt {
21412141
kind:
2142-
hir::StmtKind::Local(hir::Local {
2142+
hir::StmtKind::Let(hir::Local {
21432143
init: Some(hir::Expr { span: init_span, .. }),
21442144
ty: Some(array_ty),
21452145
..

‎compiler/rustc_infer/src/infer/error_reporting/suggest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
585585
}
586586

587587
fn visit_stmt(&mut self, ex: &'v hir::Stmt<'v>) -> Self::Result {
588-
if let hir::StmtKind::Local(hir::Local {
588+
if let hir::StmtKind::Let(hir::Local {
589589
span,
590590
pat: hir::Pat { .. },
591591
ty: None,
@@ -824,7 +824,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
824824

825825
let hir = self.tcx.hir();
826826
for stmt in blk.stmts.iter().rev() {
827-
let hir::StmtKind::Local(local) = &stmt.kind else {
827+
let hir::StmtKind::Let(local) = &stmt.kind else {
828828
continue;
829829
};
830830
local.pat.walk(&mut find_compatible_candidates);

‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ fn warn_if_doc(cx: &EarlyContext<'_>, node_span: Span, node_kind: &str, attrs: &
989989
impl EarlyLintPass for UnusedDocComment {
990990
fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &ast::Stmt) {
991991
let kind = match stmt.kind {
992-
ast::StmtKind::Local(..) => "statements",
992+
ast::StmtKind::Let(..) => "statements",
993993
// Disabled pending discussion in #78306
994994
ast::StmtKind::Item(..) => return,
995995
// expressions will be reported by `check_expr`.

‎compiler/rustc_lint/src/unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ trait UnusedDelimLint {
914914

915915
fn check_stmt(&mut self, cx: &EarlyContext<'_>, s: &ast::Stmt) {
916916
match s.kind {
917-
StmtKind::Local(ref local) if Self::LINT_EXPR_IN_PATTERN_MATCHING_CTX => {
917+
StmtKind::Let(ref local) if Self::LINT_EXPR_IN_PATTERN_MATCHING_CTX => {
918918
if let Some((init, els)) = local.kind.init_else_opt() {
919919
let ctx = match els {
920920
None => UnusedDelimsCtx::AssignedValue,
@@ -1189,7 +1189,7 @@ impl EarlyLintPass for UnusedParens {
11891189
}
11901190

11911191
fn check_stmt(&mut self, cx: &EarlyContext<'_>, s: &ast::Stmt) {
1192-
if let StmtKind::Local(ref local) = s.kind {
1192+
if let StmtKind::Let(ref local) = s.kind {
11931193
self.check_unused_parens_pat(cx, &local.pat, true, false, (true, false));
11941194
}
11951195

‎compiler/rustc_middle/src/hir/map/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ impl<'hir> Map<'hir> {
653653
| Node::ForeignItem(_)
654654
| Node::TraitItem(_)
655655
| Node::ImplItem(_)
656-
| Node::Stmt(Stmt { kind: StmtKind::Local(_), .. }) => break,
656+
| Node::Stmt(Stmt { kind: StmtKind::Let(_), .. }) => break,
657657
Node::Expr(expr @ Expr { kind: ExprKind::If(..) | ExprKind::Match(..), .. }) => {
658658
return Some(expr);
659659
}

‎compiler/rustc_mir_build/src/thir/cx/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl<'tcx> Cx<'tcx> {
6363
// ignore for purposes of the MIR
6464
None
6565
}
66-
hir::StmtKind::Local(local) => {
66+
hir::StmtKind::Let(local) => {
6767
let remainder_scope = region::Scope {
6868
id: block_id,
6969
data: region::ScopeData::Remainder(region::FirstStatementIndex::new(

‎compiler/rustc_parse/src/parser/stmt.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl<'a> Parser<'a> {
254254
let local = this.parse_local(attrs)?;
255255
// FIXME - maybe capture semicolon in recovery?
256256
Ok((
257-
this.mk_stmt(lo.to(this.prev_token.span), StmtKind::Local(local)),
257+
this.mk_stmt(lo.to(this.prev_token.span), StmtKind::Let(local)),
258258
TrailingToken::None,
259259
))
260260
})?;
@@ -278,7 +278,7 @@ impl<'a> Parser<'a> {
278278
} else {
279279
TrailingToken::None
280280
};
281-
Ok((this.mk_stmt(lo.to(this.prev_token.span), StmtKind::Local(local)), trailing))
281+
Ok((this.mk_stmt(lo.to(this.prev_token.span), StmtKind::Let(local)), trailing))
282282
})
283283
}
284284

@@ -764,7 +764,7 @@ impl<'a> Parser<'a> {
764764
}
765765
}
766766
StmtKind::Expr(_) | StmtKind::MacCall(_) => {}
767-
StmtKind::Local(local) if let Err(mut e) = self.expect_semi() => {
767+
StmtKind::Let(local) if let Err(mut e) = self.expect_semi() => {
768768
// We might be at the `,` in `let x = foo<bar, baz>;`. Try to recover.
769769
match &mut local.kind {
770770
LocalKind::Init(expr) | LocalKind::InitElse(expr, _) => {
@@ -820,7 +820,7 @@ impl<'a> Parser<'a> {
820820
}
821821
eat_semi = false;
822822
}
823-
StmtKind::Empty | StmtKind::Item(_) | StmtKind::Local(_) | StmtKind::Semi(_) => {
823+
StmtKind::Empty | StmtKind::Item(_) | StmtKind::Let(_) | StmtKind::Semi(_) => {
824824
eat_semi = false
825825
}
826826
}

‎compiler/rustc_passes/src/check_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2444,7 +2444,7 @@ impl<'tcx> Visitor<'tcx> for CheckAttrVisitor<'tcx> {
24442444

24452445
fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
24462446
// When checking statements ignore expressions, they will be checked later.
2447-
if let hir::StmtKind::Local(l) = stmt.kind {
2447+
if let hir::StmtKind::Let(l) = stmt.kind {
24482448
self.check_attributes(l.hir_id, stmt.span, Target::Statement, None);
24492449
}
24502450
intravisit::walk_stmt(self, stmt)

0 commit comments

Comments
 (0)