Skip to content

Commit 2f5e8ed

Browse files
committed
Rename many EarlyDiagCtxt arguments.
1 parent f80aeeb commit 2f5e8ed

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/bin/miri.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ fn rustc_logger_config() -> rustc_log::LoggerConfig {
215215
cfg
216216
}
217217

218-
fn init_early_loggers(handler: &EarlyDiagCtxt) {
218+
fn init_early_loggers(early_dcx: &EarlyDiagCtxt) {
219219
// Note that our `extern crate log` is *not* the same as rustc's; as a result, we have to
220220
// initialize them both, and we always initialize `miri`'s first.
221221
let env = env_logger::Env::new().filter("MIRI_LOG").write_style("MIRI_LOG_STYLE");
@@ -224,15 +224,15 @@ fn init_early_loggers(handler: &EarlyDiagCtxt) {
224224
// If it is not set, we avoid initializing now so that we can initialize later with our custom
225225
// settings, and *not* log anything for what happens before `miri` gets started.
226226
if env::var_os("RUSTC_LOG").is_some() {
227-
rustc_driver::init_logger(handler, rustc_logger_config());
227+
rustc_driver::init_logger(early_dcx, rustc_logger_config());
228228
}
229229
}
230230

231-
fn init_late_loggers(handler: &EarlyDiagCtxt, tcx: TyCtxt<'_>) {
231+
fn init_late_loggers(early_dcx: &EarlyDiagCtxt, tcx: TyCtxt<'_>) {
232232
// If `RUSTC_LOG` is not set, then `init_early_loggers` did not call
233233
// `rustc_driver::init_logger`, so we have to do this now.
234234
if env::var_os("RUSTC_LOG").is_none() {
235-
rustc_driver::init_logger(handler, rustc_logger_config());
235+
rustc_driver::init_logger(early_dcx, rustc_logger_config());
236236
}
237237

238238
// If `MIRI_BACKTRACE` is set and `RUSTC_CTFE_BACKTRACE` is not, set `RUSTC_CTFE_BACKTRACE`.

0 commit comments

Comments
 (0)