Skip to content

Commit 9360238

Browse files
committed
Use rustc_driver::args::raw_args() in Miri
1 parent e5ffba2 commit 9360238

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Diff for: src/tools/miri/src/bin/miri.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ fn main() {
346346
// (`install_ice_hook` might change `RUST_BACKTRACE`.)
347347
let env_snapshot = env::vars_os().collect::<Vec<_>>();
348348

349+
let args = rustc_driver::args::raw_args(&early_dcx).unwrap_or_else(|_| std::process::exit(rustc_driver::EXIT_FAILURE));
350+
349351
// If the environment asks us to actually be rustc, then do that.
350352
if let Some(crate_kind) = env::var_os("MIRI_BE_RUSTC") {
351353
// Earliest rustc setup.
@@ -363,7 +365,7 @@ fn main() {
363365

364366
// We cannot use `rustc_driver::main` as we need to adjust the CLI arguments.
365367
run_compiler(
366-
env::args().collect(),
368+
args,
367369
target_crate,
368370
&mut MiriBeRustCompilerCalls { target_crate },
369371
using_internal_features,
@@ -386,7 +388,7 @@ fn main() {
386388

387389
// If user has explicitly enabled/disabled isolation
388390
let mut isolation_enabled: Option<bool> = None;
389-
for arg in env::args() {
391+
for arg in args {
390392
if rustc_args.is_empty() {
391393
// Very first arg: binary name.
392394
rustc_args.push(arg);

0 commit comments

Comments
 (0)