@@ -329,7 +329,6 @@ pub(crate) fn run_tests(
329
329
struct TestRunner < ' a > {
330
330
is_native : bool ,
331
331
jit_supported : bool ,
332
- use_unstable_features : bool ,
333
332
skip_tests : & ' a [ & ' a str ] ,
334
333
dirs : Dirs ,
335
334
target_compiler : Compiler ,
@@ -361,15 +360,7 @@ impl<'a> TestRunner<'a> {
361
360
&& target_compiler. triple . contains ( "x86_64" )
362
361
&& !target_compiler. triple . contains ( "windows" ) ;
363
362
364
- Self {
365
- is_native,
366
- jit_supported,
367
- use_unstable_features,
368
- skip_tests,
369
- dirs,
370
- target_compiler,
371
- stdlib_source,
372
- }
363
+ Self { is_native, jit_supported, skip_tests, dirs, target_compiler, stdlib_source }
373
364
}
374
365
375
366
fn run_testsuite ( & self , tests : & [ TestCase ] ) {
@@ -393,31 +384,13 @@ impl<'a> TestRunner<'a> {
393
384
match * cmd {
394
385
TestCaseCmd :: Custom { func } => func ( self ) ,
395
386
TestCaseCmd :: BuildLib { source, crate_types } => {
396
- if self . use_unstable_features {
397
- self . run_rustc ( [ source, "--crate-type" , crate_types] ) ;
398
- } else {
399
- self . run_rustc ( [
400
- source,
401
- "--crate-type" ,
402
- crate_types,
403
- "--cfg" ,
404
- "no_unstable_features" ,
405
- ] ) ;
406
- }
387
+ self . run_rustc ( [ source, "--crate-type" , crate_types] ) ;
407
388
}
408
389
TestCaseCmd :: BuildBin { source } => {
409
- if self . use_unstable_features {
410
- self . run_rustc ( [ source] ) ;
411
- } else {
412
- self . run_rustc ( [ source, "--cfg" , "no_unstable_features" ] ) ;
413
- }
390
+ self . run_rustc ( [ source] ) ;
414
391
}
415
392
TestCaseCmd :: BuildBinAndRun { source, args } => {
416
- if self . use_unstable_features {
417
- self . run_rustc ( [ source] ) ;
418
- } else {
419
- self . run_rustc ( [ source, "--cfg" , "no_unstable_features" ] ) ;
420
- }
393
+ self . run_rustc ( [ source] ) ;
421
394
self . run_out_command (
422
395
source. split ( '/' ) . last ( ) . unwrap ( ) . split ( '.' ) . next ( ) . unwrap ( ) ,
423
396
args,
@@ -472,7 +445,6 @@ impl<'a> TestRunner<'a> {
472
445
cmd. arg ( & self . target_compiler . triple ) ;
473
446
cmd. arg ( "-Cpanic=abort" ) ;
474
447
cmd. arg ( "-Zunstable-options" ) ;
475
- cmd. arg ( "--check-cfg=cfg(no_unstable_features)" ) ;
476
448
cmd. arg ( "--check-cfg=cfg(jit)" ) ;
477
449
cmd. args ( args) ;
478
450
cmd
0 commit comments