refactor: Require ecx less

Author: futile

compiler/rustc_expand/src/derive_macro_expansion.rs

@@ -18,19 +18,23 @@ pub(super) fn provide_derive_macro_expansion<'tcx>(
 
     let res = with_context(|(ecx, client)| {
         let span = invoc_id.expn_data().call_site;
-        let _timer = ecx.sess.prof.generic_activity_with_arg_recorder(
+        let _timer = tcx.sess.prof.generic_activity_with_arg_recorder(
             "expand_derive_proc_macro_inner",
             |recorder| {
-                recorder.record_arg_with_span(ecx.sess.source_map(), ecx.expansion_descr(), span);
+                recorder.record_arg_with_span(
+                    tcx.sess.source_map(),
+                    invoc_id.expn_data().kind.descr(),
+                    span,
+                );
             },
         );
         let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
-        let strategy = crate::proc_macro::exec_strategy(ecx);
+        let strategy = crate::proc_macro::exec_strategy(tcx.sess);
         let server = crate::proc_macro_server::Rustc::new(ecx);
         let res = match client.run(&strategy, server, input.clone(), proc_macro_backtrace) {
             Ok(stream) => Ok(tcx.arena.alloc(stream) as &TokenStream),
             Err(e) => {
-                ecx.dcx().emit_err({
+                tcx.dcx().emit_err({
                     errors::ProcMacroDerivePanicked {
                         span,
                         message: e.as_str().map(|message| errors::ProcMacroDerivePanickedHelp {

compiler/rustc_expand/src/proc_macro.rs

@@ -4,6 +4,7 @@ use rustc_ast::tokenstream::TokenStream;
 use rustc_errors::ErrorGuaranteed;
 use rustc_middle::ty;
 use rustc_parse::parser::{ForceCollect, Parser};
+use rustc_session::Session;
 use rustc_session::config::ProcMacroExecutionStrategy;
 use rustc_span::Span;
 use rustc_span::profiling::SpannedEventArgRecorder;
@@ -32,9 +33,9 @@ impl<T> pm::bridge::server::MessagePipe<T> for MessagePipe<T> {
     }
 }
 
-pub fn exec_strategy(ecx: &ExtCtxt<'_>) -> impl pm::bridge::server::ExecutionStrategy {
+pub fn exec_strategy(sess: &Session) -> impl pm::bridge::server::ExecutionStrategy {
     pm::bridge::server::MaybeCrossThread::<MessagePipe<_>>::new(
-        ecx.sess.opts.unstable_opts.proc_macro_execution_strategy
+        sess.opts.unstable_opts.proc_macro_execution_strategy
             == ProcMacroExecutionStrategy::CrossThread,
     )
 }
@@ -56,7 +57,7 @@ impl base::BangProcMacro for BangProcMacro {
             });
 
         let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
-        let strategy = exec_strategy(ecx);
+        let strategy = exec_strategy(ecx.sess);
         let server = proc_macro_server::Rustc::new(ecx);
         self.client.run(&strategy, server, input, proc_macro_backtrace).map_err(|e| {
             ecx.dcx().emit_err(errors::ProcMacroPanicked {
@@ -87,7 +88,7 @@ impl base::AttrProcMacro for AttrProcMacro {
             });
 
         let proc_macro_backtrace = ecx.ecfg.proc_macro_backtrace;
-        let strategy = exec_strategy(ecx);
+        let strategy = exec_strategy(ecx.sess);
         let server = proc_macro_server::Rustc::new(ecx);
         self.client.run(&strategy, server, annotation, annotated, proc_macro_backtrace).map_err(
             |e| {