Skip to content

Commit 06a78be

Browse files
author
The Miri Conjob Bot
committed
fmt
1 parent 08b0023 commit 06a78be

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/bin/miri.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ fn run_compiler(
241241
mut args: Vec<String>,
242242
target_crate: bool,
243243
callbacks: &mut (dyn rustc_driver::Callbacks + Send),
244-
using_internal_features: std::sync::Arc<std::sync::atomic::AtomicBool>
244+
using_internal_features: std::sync::Arc<std::sync::atomic::AtomicBool>,
245245
) -> ! {
246246
if target_crate {
247247
// Miri needs a custom sysroot for target crates.
@@ -275,7 +275,8 @@ fn run_compiler(
275275
// Invoke compiler, and handle return code.
276276
let exit_code = rustc_driver::catch_with_exit_code(move || {
277277
rustc_driver::RunCompiler::new(&args, callbacks)
278-
.set_using_internal_features(using_internal_features).run()
278+
.set_using_internal_features(using_internal_features)
279+
.run()
279280
});
280281
std::process::exit(exit_code)
281282
}
@@ -297,7 +298,8 @@ fn main() {
297298
// If the environment asks us to actually be rustc, then do that.
298299
if let Some(crate_kind) = env::var_os("MIRI_BE_RUSTC") {
299300
// Earliest rustc setup.
300-
let using_internal_features = rustc_driver::install_ice_hook(rustc_driver::DEFAULT_BUG_REPORT_URL, |_| ());
301+
let using_internal_features =
302+
rustc_driver::install_ice_hook(rustc_driver::DEFAULT_BUG_REPORT_URL, |_| ());
301303
rustc_driver::init_rustc_env_logger(&handler);
302304

303305
let target_crate = if crate_kind == "target" {
@@ -318,7 +320,8 @@ fn main() {
318320
}
319321

320322
// Add an ICE bug report hook.
321-
let using_internal_features = rustc_driver::install_ice_hook("https://github.com/rust-lang/miri/issues/new", |_| ());
323+
let using_internal_features =
324+
rustc_driver::install_ice_hook("https://github.com/rust-lang/miri/issues/new", |_| ());
322325

323326
// Init loggers the Miri way.
324327
init_early_loggers(&handler);
@@ -581,5 +584,10 @@ fn main() {
581584

582585
debug!("rustc arguments: {:?}", rustc_args);
583586
debug!("crate arguments: {:?}", miri_config.args);
584-
run_compiler(rustc_args, /* target_crate: */ true, &mut MiriCompilerCalls { miri_config }, using_internal_features)
587+
run_compiler(
588+
rustc_args,
589+
/* target_crate: */ true,
590+
&mut MiriCompilerCalls { miri_config },
591+
using_internal_features,
592+
)
585593
}

tests/fail/dangling_pointers/dangling_pointer_deref_match_never.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ fn main() {
1414
}
1515
panic!("this should never print");
1616
}
17-

0 commit comments

Comments
 (0)