squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Improve fallback span for closure migration lint.

Browse source
This commit is contained in:
Mara Bos 2021-08-12 20:35:54 +02:00
parent cd7f960314
commit 26c590d1b3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_typeck/src/check/upvar.rs
View file

@ -655,7 +655,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
closure_body_span = closure_body_span.parent().unwrap_or(DUMMY_SP);
}
let (sugg, app) =
let (span, sugg, app) =
match self.tcx.sess.source_map().span_to_snippet(closure_body_span) {
Ok(s) => {
let trimmed = s.trim_start();
@ -667,9 +667,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} else {
format!("{{ {}; {} }}", migration_string, s)
};
(sugg, Applicability::MachineApplicable)
(closure_body_span, sugg, Applicability::MachineApplicable)
}
Err(_) => (migration_string.clone(), Applicability::HasPlaceholders),
Err(_) => (closure_span, migration_string.clone(), Applicability::HasPlaceholders),
};
let diagnostic_msg = format!(
@ -678,7 +678,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
);
diagnostics_builder.span_suggestion(
closure_body_span,
span,
&diagnostic_msg,
sugg,
app,