bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't use bytepos offsets when computing semicolon span for removal

Browse source
This commit is contained in:
Michael Goulet 2024-04-07 19:28:01 -04:00
parent 033becf83c
commit a439eb259d
3 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_infer/src/infer/error_reporting/suggest.rs
View file

@ -15,7 +15,7 @@ use rustc_middle::traits::{
};
use rustc_middle::ty::print::with_no_trimmed_paths;
use rustc_middle::ty::{self as ty, GenericArgKind, IsSuggestable, Ty, TypeVisitableExt};
use rustc_span::{sym, BytePos, Span};
use rustc_span::{sym, Span};
use crate::errors::{
ConsiderAddingAwait, FnConsiderCasting, FnItemsAreDistinct, FnUniqTypes,
@ -763,8 +763,15 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
let mac_call = rustc_span::source_map::original_sp(last_stmt.span, blk.span);
self.tcx.sess.source_map().mac_call_stmt_semi_span(mac_call)?
} else {
last_stmt.span.with_lo(last_stmt.span.hi() - BytePos(1))
self.tcx
.sess
.source_map()
.span_extend_while(last_expr.span, |c| c.is_whitespace())
.ok()?
.shrink_to_hi()
.with_hi(last_stmt.span.hi())
};
Some((span, needs_box))
}