mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Esteban Küber 2024-04-12 04:45:50 +00:00
parent d97d2fe744
commit 3cdc6897c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View File

@ -1139,7 +1139,7 @@ pub(crate) fn suggest_cloning(
if let Some(other_expr) = other_expr if let Some(other_expr) = other_expr
&& let Some(parent_let) = && let Some(parent_let) =
self.infcx.tcx.hir().parent_iter(expr.hir_id).find_map(|n| { 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) Some(hir_id)
} else { } else {
None None
@ -1147,7 +1147,7 @@ pub(crate) fn suggest_cloning(
}) })
&& let Some(other_parent_let) = && let Some(other_parent_let) =
self.infcx.tcx.hir().parent_iter(other_expr.hir_id).find_map(|n| { 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) Some(hir_id)
} else { } else {
None None