bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #84358 - sexxi-goose:print_captures_borrowck_rebased, r=nikomatsakis

Browse source 
Update closure capture error logging for disjoint captures for disjoint captures

Improved error logging when `#![feature(capture_disjoint_fields)]` is used.

Closes https://github.com/rust-lang/project-rfc-2229/issues/8
Closes https://github.com/rust-lang/project-rfc-2229/issues/36
Closes https://github.com/rust-lang/project-rfc-2229/issues/39
Closes #76005
This commit is contained in:
Dylan DPC 2021-05-02 17:00:21 +02:00 • committed by GitHub
commit a00edce017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 535 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_typeck/src/expr_use_visitor.rs
View file

@ -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(),