rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

first move on a nested span_label

Browse Source 
Apply suggestions from code review

Co-authored-by: David Wood <agile.lion3441@fuligin.ink>
This commit is contained in:
AndyJado
2022-10-26 10:42:05 +08:00
parent 452cf4f710
commit e49d10db14
4 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,13 +724,19 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
borrow_span,
&self.describe_any_place(borrow.borrowed_place.as_ref()),
);
borrow_spans.var_span_label(
borrow_spans.var_subdiag(
&mut err,
{
|var_span| {
use crate::session_diagnostics::CaptureVarCause::*;
let place = &borrow.borrowed_place;
let desc_place = self.describe_any_place(place.as_ref());
format!("borrow occurs due to use of {}{}", desc_place, borrow_spans.describe())
match borrow_spans {
UseSpans::ClosureUse { generator_kind, .. } => match generator_kind {
Some(_) => BorrowUsePlaceGenerator { place: desc_place, var_span },
None => BorrowUsePlaceClosure { place: desc_place, var_span },
},
_ => BorrowUsePlace { place: desc_place, var_span },
}
},
"mutable",
);