From 3cdc6897c5ad21006a15a1bd567bfa5c2f3c9e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Fri, 12 Apr 2024 04:45:50 +0000 Subject: [PATCH] Fix rebase --- compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs index 860f8882ad3..662bdce197f 100644 --- a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs +++ b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs @@ -1139,7 +1139,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { if let Some(other_expr) = other_expr && let Some(parent_let) = self.infcx.tcx.hir().parent_iter(expr.hir_id).find_map(|n| { - if let (hir_id, hir::Node::Local(_) | hir::Node::Stmt(_)) = n { + if let (hir_id, hir::Node::LetStmt(_) | hir::Node::Stmt(_)) = n { Some(hir_id) } else { None @@ -1147,7 +1147,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { }) && let Some(other_parent_let) = self.infcx.tcx.hir().parent_iter(other_expr.hir_id).find_map(|n| { - if let (hir_id, hir::Node::Local(_) | hir::Node::Stmt(_)) = n { + if let (hir_id, hir::Node::LetStmt(_) | hir::Node::Stmt(_)) = n { Some(hir_id) } else { None