Skip to content

Commit c082ee2

Browse files
committed
rustdoc::test: use build_controller, rather than setting up CompileController manually.
1 parent fbffa94 commit c082ee2

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/librustdoc/test.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use rustc_lint;
2424
use rustc::session::{self, config};
2525
use rustc::session::config::get_unstable_features_setting;
2626
use rustc::session::search_paths::{SearchPaths, PathKind};
27-
use rustc_driver::{driver, Compilation};
27+
use rustc_driver::{driver, CompilerCalls, RustcDefaultCalls};
2828
use syntax::codemap::CodeMap;
2929
use syntax::diagnostic;
3030

@@ -117,15 +117,16 @@ fn runtest(test: &str, cratename: &str, libs: SearchPaths,
117117
let sessopts = config::Options {
118118
maybe_sysroot: Some(os::self_exe_name().unwrap().dir_path().dir_path()),
119119
search_paths: libs,
120-
crate_types: vec!(config::CrateTypeExecutable),
121-
output_types: vec!(config::OutputTypeExe),
120+
crate_types: vec![config::CrateTypeExecutable],
121+
output_types: vec![config::OutputTypeExe],
122122
externs: externs,
123123
cg: config::CodegenOptions {
124124
prefer_dynamic: true,
125125
.. config::basic_codegen_options()
126126
},
127127
test: as_test_harness,
128128
unstable_features: get_unstable_features_setting(),
129+
no_trans: no_run,
129130
..config::basic_options().clone()
130131
};
131132

@@ -173,10 +174,7 @@ fn runtest(test: &str, cratename: &str, libs: SearchPaths,
173174
let out = Some(outdir.path().clone());
174175
let cfg = config::build_configuration(&sess);
175176
let libdir = sess.target_filesearch(PathKind::All).get_lib_path();
176-
let mut control = driver::CompileController::basic();
177-
if no_run {
178-
control.after_analysis.stop = Compilation::Stop;
179-
}
177+
let control = RustcDefaultCalls::new().build_controller(&sess);
180178
driver::compile_input(sess, cfg, &input, &out, &None, None, control);
181179

182180
if no_run { return }

0 commit comments

Comments
 (0)