@@ -1126,16 +1126,10 @@ impl fmt::Display for Status {
11261126
11271127fn compile_test ( config : & Config , props : & TestProps ,
11281128 testfile : & Path ) -> ProcRes {
1129- compile_test_ ( config, props, testfile, & [ ] )
1130- }
1131-
1132- fn compile_test_ ( config : & Config , props : & TestProps ,
1133- testfile : & Path , extra_args : & [ String ] ) -> ProcRes {
11341129 let aux_dir = aux_output_dir_name ( config, testfile) ;
11351130 // FIXME (#9639): This needs to handle non-utf8 paths
1136- let mut link_args = vec ! ( "-L" . to_string( ) ,
1137- aux_dir. to_str( ) . unwrap( ) . to_string( ) ) ;
1138- link_args. extend ( extra_args. iter ( ) . cloned ( ) ) ;
1131+ let link_args = vec ! ( "-L" . to_string( ) ,
1132+ aux_dir. to_str( ) . unwrap( ) . to_string( ) ) ;
11391133 let args = make_compile_args ( config,
11401134 props,
11411135 link_args,
@@ -1144,7 +1138,7 @@ fn compile_test_(config: &Config, props: &TestProps,
11441138}
11451139
11461140fn document ( config : & Config , props : & TestProps ,
1147- testfile : & Path , extra_args : & [ String ] ) -> ( ProcRes , PathBuf ) {
1141+ testfile : & Path ) -> ( ProcRes , PathBuf ) {
11481142 let aux_dir = aux_output_dir_name ( config, testfile) ;
11491143 let out_dir = output_base_name ( config, testfile) ;
11501144 let _ = fs:: remove_dir_all ( & out_dir) ;
@@ -1154,7 +1148,6 @@ fn document(config: &Config, props: &TestProps,
11541148 "-o" . to_string( ) ,
11551149 out_dir. to_str( ) . unwrap( ) . to_string( ) ,
11561150 testfile. to_str( ) . unwrap( ) . to_string( ) ] ;
1157- args. extend ( extra_args. iter ( ) . cloned ( ) ) ;
11581151 args. extend ( split_maybe_args ( & props. compile_flags ) ) ;
11591152 let args = ProcArgs {
11601153 prog : config. rustdoc_path . to_str ( ) . unwrap ( ) . to_string ( ) ,
@@ -1717,7 +1710,7 @@ fn charset() -> &'static str {
17171710}
17181711
17191712fn run_rustdoc_test ( config : & Config , props : & TestProps , testfile : & Path ) {
1720- let ( proc_res, out_dir) = document ( config, props, testfile, & [ ] ) ;
1713+ let ( proc_res, out_dir) = document ( config, props, testfile) ;
17211714 if !proc_res. status . success ( ) {
17221715 fatal_proc_rec ( "rustdoc failed!" , & proc_res) ;
17231716 }
0 commit comments