diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-25 13:58:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 13:58:02 -0700 |
| commit | c2e3521bfbef47939d858a0c9d11e08b71bc80c0 (patch) | |
| tree | 255ebd85d7c30ba43616a673bf014d19be47c1f2 /compiler/rustc_errors/src | |
| parent | cb5b40269f6f087e4bdb8cc1c2776fd47eda1a3e (diff) | |
| parent | 3a423c3feb9b4827ff8b3dd1e18307df700320f2 (diff) | |
| download | rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.tar.gz rust-c2e3521bfbef47939d858a0c9d11e08b71bc80c0.zip | |
Rollup merge of #111950 - cjgillot:expn-noinline, r=oli-obk
Remove ExpnKind::Inlined. Suggested in https://github.com/rust-lang/rust/pull/111815#issuecomment-1561903339 r? ``@oli-obk``
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 6d944e51314..e8cd7eaa60f 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -332,7 +332,7 @@ pub trait Emitter: Translate { // Skip past non-macro entries, just in case there // are some which do actually involve macros. - ExpnKind::Inlined | ExpnKind::Desugaring(..) | ExpnKind::AstPass(..) => None, + ExpnKind::Desugaring(..) | ExpnKind::AstPass(..) => None, ExpnKind::Macro(macro_kind, name) => Some((macro_kind, name)), } @@ -403,7 +403,7 @@ pub trait Emitter: Translate { continue; } - if always_backtrace && !matches!(trace.kind, ExpnKind::Inlined) { + if always_backtrace { new_labels.push(( trace.def_site, format!( @@ -442,7 +442,6 @@ pub trait Emitter: Translate { "this derive macro expansion".into() } ExpnKind::Macro(MacroKind::Bang, _) => "this macro invocation".into(), - ExpnKind::Inlined => "this inlined function call".into(), ExpnKind::Root => "the crate root".into(), ExpnKind::AstPass(kind) => kind.descr().into(), ExpnKind::Desugaring(kind) => { |