bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

coverage: Unexpand spans with find_ancestor_inside_same_ctxt

Browse source
This commit is contained in:
Zalathar 2023-12-26 23:21:58 +11:00
parent df5d53585a
commit be6b059169
2 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs
View file

@ -204,10 +204,5 @@ fn filtered_terminator_span(terminator: &Terminator<'_>) -> Option<Span> {
/// etc.).
#[inline]
fn unexpand_into_body_span(span: Span, body_span: Span) -> Option<Span> {
use rustc_span::source_map::original_sp;
// FIXME(#118525): Consider switching from `original_sp` to `Span::find_ancestor_inside`,
// which is similar but gives slightly different results in some edge cases.
let original_span = original_sp(span, body_span).with_ctxt(body_span.ctxt());
body_span.contains(original_span).then_some(original_span)
span.find_ancestor_inside_same_ctxt(body_span)
}