diff options
| author | bors <bors@rust-lang.org> | 2022-02-28 08:25:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-28 08:25:26 +0000 |
| commit | 48132caac241b4a278d58e1d791c6d31f7439ad6 (patch) | |
| tree | 5ac49406823aa148c132f825cdaa5dc37ea04e5e /compiler/rustc_errors/src | |
| parent | 427cf81206d3b6cf41c86c1b9ce113a33f1ce860 (diff) | |
| parent | e77e4fcf898ca4b2aa2041d2cbac200ed0f11b5b (diff) | |
| download | rust-48132caac241b4a278d58e1d791c6d31f7439ad6.tar.gz rust-48132caac241b4a278d58e1d791c6d31f7439ad6.zip | |
Auto merge of #94427 - cjgillot:inline-fresh-expn, r=oli-obk
Only create a single expansion for each inline integration. The inlining integrator used to create one expansion for each span from the callee body. This PR reverses the logic to create a single expansion for the whole call, which is more consistent with how macro expansions work for macros. This should remove the large memory regression in #91743.
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index bfed9211cec..52c44231d8f 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -408,8 +408,8 @@ pub trait Emitter { "this derive macro expansion".into() } ExpnKind::Macro(MacroKind::Bang, _) => "this macro invocation".into(), - ExpnKind::Inlined => "the inlined copy of this code".into(), - ExpnKind::Root => "in the crate root".into(), + ExpnKind::Inlined => "this inlined function call".into(), + ExpnKind::Root => "the crate root".into(), ExpnKind::AstPass(kind) => kind.descr().into(), ExpnKind::Desugaring(kind) => { format!("this {} desugaring", kind.descr()).into() |