Rollup merge of #109307 - cjgillot:inline-location, r=compiler-errors

Ignore `Inlined` spans when computing caller location. Fixes https://github.com/rust-lang/rust/issues/105538
2023-03-20 09:46:54 +01:00 · 2023-03-20 09:46:54 +01:00 · 3efecba6e7
commit 3efecba6e7
parent d86fd83ef6 be8b323929
5 changed files with 37 additions and 5 deletions
--- a/compiler/rustc_span/src/hygiene.rs
+++ b/compiler/rustc_span/src/hygiene.rs
@ -880,7 +880,7 @@ impl Span {
    pub fn fresh_expansion(self, expn_id: LocalExpnId) -> Span {
        HygieneData::with(|data| {
            self.with_ctxt(data.apply_mark(
-                SyntaxContext::root(),
+                self.ctxt(),
                expn_id.to_expn_id(),
                Transparency::Transparent,
            ))