user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use more accurate lint root for mutable_borrow_reservation_conflict

Browse source
This commit is contained in:
Matthew Jasper 2019-03-31 13:30:51 +01:00
parent 820b088a21
commit cc5088d294
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_mir/borrow_check/mod.rs
View file

@ -268,9 +268,16 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
for (_, (place, span, context, bk, borrow)) in reservation_warnings {
let mut initial_diag = mbcx.report_conflicting_borrow(context, (&place, span), bk, &borrow);
let lint_root = if let ClearCrossCrate::Set(ref vsi) = mbcx.mir.source_scope_local_data {
let scope = mbcx.mir.source_info(context.loc).scope;
vsi[scope].lint_root
} else {
id
};
// Span and message don't matter; we overwrite them below anyway
let mut diag = mbcx.infcx.tcx.struct_span_lint_hir(
MUTABLE_BORROW_RESERVATION_CONFLICT, id, DUMMY_SP, "");
MUTABLE_BORROW_RESERVATION_CONFLICT, lint_root, DUMMY_SP, "");
diag.message = initial_diag.styled_message().clone();
diag.span = initial_diag.span.clone();