@@ -1126,16 +1126,10 @@ impl fmt::Display for Status {
1126
1126
1127
1127
fn compile_test ( config : & Config , props : & TestProps ,
1128
1128
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 {
1134
1129
let aux_dir = aux_output_dir_name ( config, testfile) ;
1135
1130
// 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( ) ) ;
1139
1133
let args = make_compile_args ( config,
1140
1134
props,
1141
1135
link_args,
@@ -1144,7 +1138,7 @@ fn compile_test_(config: &Config, props: &TestProps,
1144
1138
}
1145
1139
1146
1140
fn document ( config : & Config , props : & TestProps ,
1147
- testfile : & Path , extra_args : & [ String ] ) -> ( ProcRes , PathBuf ) {
1141
+ testfile : & Path ) -> ( ProcRes , PathBuf ) {
1148
1142
let aux_dir = aux_output_dir_name ( config, testfile) ;
1149
1143
let out_dir = output_base_name ( config, testfile) ;
1150
1144
let _ = fs:: remove_dir_all ( & out_dir) ;
@@ -1154,7 +1148,6 @@ fn document(config: &Config, props: &TestProps,
1154
1148
"-o" . to_string( ) ,
1155
1149
out_dir. to_str( ) . unwrap( ) . to_string( ) ,
1156
1150
testfile. to_str( ) . unwrap( ) . to_string( ) ] ;
1157
- args. extend ( extra_args. iter ( ) . cloned ( ) ) ;
1158
1151
args. extend ( split_maybe_args ( & props. compile_flags ) ) ;
1159
1152
let args = ProcArgs {
1160
1153
prog : config. rustdoc_path . to_str ( ) . unwrap ( ) . to_string ( ) ,
@@ -1717,7 +1710,7 @@ fn charset() -> &'static str {
1717
1710
}
1718
1711
1719
1712
fn 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) ;
1721
1714
if !proc_res. status . success ( ) {
1722
1715
fatal_proc_rec ( "rustdoc failed!" , & proc_res) ;
1723
1716
}
0 commit comments