Skip to content

Commit 2eca717

Browse files
committed
Remove EarlyErrorHandler argument from after_analysis callback
It is only used by miri which can create a new one using the Session.
1 parent 90e9053 commit 2eca717

File tree

4 files changed

+4
-8
lines changed
  • compiler
    • rustc_driver_impl/src
    • rustc_smir/src/rustc_internal
  • src/tools/miri/src/bin
  • tests/run-make-fulldeps/obtain-borrowck

4 files changed

+4
-8
lines changed

compiler/rustc_driver_impl/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ pub trait Callbacks {
185185
/// continue the compilation afterwards (defaults to `Compilation::Continue`)
186186
fn after_analysis<'tcx>(
187187
&mut self,
188-
_handler: &EarlyErrorHandler,
189188
_compiler: &interface::Compiler,
190189
_queries: &'tcx Queries<'tcx>,
191190
) -> Compilation {
@@ -446,7 +445,7 @@ fn run_compiler(
446445

447446
queries.global_ctxt()?.enter(|tcx| tcx.analysis(()))?;
448447

449-
if callbacks.after_analysis(&handler, compiler, queries) == Compilation::Stop {
448+
if callbacks.after_analysis(compiler, queries) == Compilation::Stop {
450449
return early_exit();
451450
}
452451

compiler/rustc_smir/src/rustc_internal/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use rustc_driver::{Callbacks, Compilation, RunCompiler};
1616
use rustc_interface::{interface, Queries};
1717
use rustc_middle::mir::interpret::AllocId;
1818
use rustc_middle::ty::TyCtxt;
19-
use rustc_session::EarlyErrorHandler;
2019
pub use rustc_span::def_id::{CrateNum, DefId};
2120

2221
fn with_tables<R>(mut f: impl FnMut(&mut Tables<'_>) -> R) -> R {
@@ -233,7 +232,6 @@ where
233232
/// continue the compilation afterwards (defaults to `Compilation::Continue`)
234233
fn after_analysis<'tcx>(
235234
&mut self,
236-
_handler: &EarlyErrorHandler,
237235
_compiler: &interface::Compiler,
238236
queries: &'tcx Queries<'tcx>,
239237
) -> Compilation {

src/tools/miri/src/bin/miri.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
5959

6060
fn after_analysis<'tcx>(
6161
&mut self,
62-
handler: &EarlyErrorHandler,
6362
_: &rustc_interface::interface::Compiler,
6463
queries: &'tcx rustc_interface::Queries<'tcx>,
6564
) -> Compilation {
@@ -68,7 +67,8 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
6867
tcx.sess.fatal("miri cannot be run on programs that fail compilation");
6968
}
7069

71-
init_late_loggers(handler, tcx);
70+
let handler = EarlyErrorHandler::new(tcx.sess.opts.error_format);
71+
init_late_loggers(&handler, tcx);
7272
if !tcx.crate_types().contains(&CrateType::Executable) {
7373
tcx.sess.fatal("miri only makes sense on bin crates");
7474
}

tests/run-make-fulldeps/obtain-borrowck/driver.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use rustc_interface::{Config, Queries};
2727
use rustc_middle::query::queries::mir_borrowck::ProvidedValue;
2828
use rustc_middle::query::{ExternProviders, Providers};
2929
use rustc_middle::ty::TyCtxt;
30-
use rustc_session::{Session, EarlyErrorHandler};
30+
use rustc_session::Session;
3131
use std::cell::RefCell;
3232
use std::collections::HashMap;
3333
use std::thread_local;
@@ -58,7 +58,6 @@ impl rustc_driver::Callbacks for CompilerCalls {
5858
// the result.
5959
fn after_analysis<'tcx>(
6060
&mut self,
61-
_handler: &EarlyErrorHandler,
6261
compiler: &Compiler,
6362
queries: &'tcx Queries<'tcx>,
6463
) -> Compilation {

0 commit comments

Comments
 (0)