diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2024-04-12 04:45:50 +0000 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2024-04-12 04:45:50 +0000 |
| commit | 3cdc6897c5ad21006a15a1bd567bfa5c2f3c9e49 (patch) | |
| tree | 9ff26e327c4a885d3f9a20c143da7b9e9f9793ee | |
| parent | d97d2fe7440ea3032a93fa3ebf8d62fea0337d04 (diff) | |
| download | rust-3cdc6897c5ad21006a15a1bd567bfa5c2f3c9e49.tar.gz rust-3cdc6897c5ad21006a15a1bd567bfa5c2f3c9e49.zip | |
Fix rebase
| -rw-r--r-- | compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs | 4 |
1 files 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 |