@@ -30,7 +30,7 @@ use std::ops::Range;
30
30
use std:: path:: PathBuf ;
31
31
use std:: str:: FromStr ;
32
32
use std:: sync:: atomic:: { AtomicI32 , Ordering } ;
33
- use std:: sync:: { Arc , Once } ;
33
+ use std:: sync:: Once ;
34
34
35
35
use miri:: {
36
36
BacktraceStyle , BorrowTrackerMethod , MiriConfig , MiriEntryFnType , ProvenanceMode , RetagFields , ValidationMode ,
@@ -370,13 +370,10 @@ fn init_late_loggers(early_dcx: &EarlyDiagCtxt, tcx: TyCtxt<'_>) {
370
370
fn run_compiler_and_exit (
371
371
args : & [ String ] ,
372
372
callbacks : & mut ( dyn rustc_driver:: Callbacks + Send ) ,
373
- using_internal_features : Arc < std:: sync:: atomic:: AtomicBool > ,
374
373
) -> ! {
375
374
// Invoke compiler, and handle return code.
376
375
let exit_code = rustc_driver:: catch_with_exit_code ( move || {
377
- rustc_driver:: RunCompiler :: new ( args, callbacks)
378
- . set_using_internal_features ( using_internal_features)
379
- . run ( ) ;
376
+ rustc_driver:: run_compiler ( args, callbacks) ;
380
377
Ok ( ( ) )
381
378
} ) ;
382
379
std:: process:: exit ( exit_code)
@@ -467,8 +464,7 @@ fn main() {
467
464
// If the environment asks us to actually be rustc, then do that.
468
465
if let Some ( crate_kind) = env:: var_os ( "MIRI_BE_RUSTC" ) {
469
466
// Earliest rustc setup.
470
- let using_internal_features =
471
- rustc_driver:: install_ice_hook ( rustc_driver:: DEFAULT_BUG_REPORT_URL , |_| ( ) ) ;
467
+ rustc_driver:: install_ice_hook ( rustc_driver:: DEFAULT_BUG_REPORT_URL , |_| ( ) ) ;
472
468
rustc_driver:: init_rustc_env_logger ( & early_dcx) ;
473
469
474
470
let target_crate = if crate_kind == "target" {
@@ -492,16 +488,11 @@ fn main() {
492
488
}
493
489
494
490
// We cannot use `rustc_driver::main` as we want it to use `args` as the CLI arguments.
495
- run_compiler_and_exit (
496
- & args,
497
- & mut MiriBeRustCompilerCalls { target_crate } ,
498
- using_internal_features,
499
- )
491
+ run_compiler_and_exit ( & args, & mut MiriBeRustCompilerCalls { target_crate } )
500
492
}
501
493
502
494
// Add an ICE bug report hook.
503
- let using_internal_features =
504
- rustc_driver:: install_ice_hook ( "https://github.com/rust-lang/miri/issues/new" , |_| ( ) ) ;
495
+ rustc_driver:: install_ice_hook ( "https://github.com/rust-lang/miri/issues/new" , |_| ( ) ) ;
505
496
506
497
// Init loggers the Miri way.
507
498
init_early_loggers ( & early_dcx) ;
@@ -735,9 +726,5 @@ fn main() {
735
726
736
727
debug ! ( "rustc arguments: {:?}" , rustc_args) ;
737
728
debug ! ( "crate arguments: {:?}" , miri_config. args) ;
738
- run_compiler_and_exit (
739
- & rustc_args,
740
- & mut MiriCompilerCalls :: new ( miri_config, many_seeds) ,
741
- using_internal_features,
742
- )
729
+ run_compiler_and_exit ( & rustc_args, & mut MiriCompilerCalls :: new ( miri_config, many_seeds) )
743
730
}
0 commit comments