Closure capture borrow diagnostics for disjoint captures

2021-03-17 02:51:27 -04:00 · 2021-03-17 02:51:27 -04:00 · 08c4fbcea7
commit 08c4fbcea7
parent 6e2a34474b
56 changed files with 532 additions and 152 deletions
--- a/compiler/rustc_typeck/src/expr_use_visitor.rs
+++ b/compiler/rustc_typeck/src/expr_use_visitor.rs
@ -763,7 +763,9 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
                        PlaceBase::Local(*var_hir_id)
                    };
                    let place_with_id = PlaceWithHirId::new(
-                        capture_info.path_expr_id.unwrap_or(closure_expr.hir_id),
+                        capture_info.path_expr_id.unwrap_or(
+                            capture_info.capture_kind_expr_id.unwrap_or(closure_expr.hir_id),
+                        ),
                        place.base_ty,
                        place_base,
                        place.projections.clone(),