diff options
| author | bors <bors@rust-lang.org> | 2016-07-03 18:17:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-03 18:17:36 -0700 |
| commit | bbdbe99c7a6773cba8d0210e6b0a8826f1618d64 (patch) | |
| tree | 5e5d28a3a3206f4af78f2e74989cfb1b2d93e44a /src/test | |
| parent | 696b703b5a58816bb0e549ac332a98fa7e635949 (diff) | |
| parent | d1e3d6272e5128e15ba0ea3bd7c4588b5e8c444a (diff) | |
| download | rust-bbdbe99c7a6773cba8d0210e6b0a8826f1618d64.tar.gz rust-bbdbe99c7a6773cba8d0210e6b0a8826f1618d64.zip | |
Auto merge of #34480 - jseyfried:remove_entry_points, r=nrc
Remove redundant `CompileController` entry points Remove the `after_expand` and `after_write_deps` `CompileController` entry points. The only things that separate these entry points from `after_hir_lowering` are dep-info generation and HIR map construction, neither of which is computationally intensive or has the potential to error. r? @nrc
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/execution-engine/test.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs index a94b2a85c77..21e1463b6ef 100644 --- a/src/test/run-make/execution-engine/test.rs +++ b/src/test/run-make/execution-engine/test.rs @@ -241,8 +241,9 @@ fn compile_program(input: &str, sysroot: PathBuf) let krate = panictry!(driver::phase_1_parse_input(&sess, cfg, &input)); let driver::ExpansionResult { defs, analysis, resolutions, mut hir_forest, .. } = { - driver::phase_2_configure_and_expand(&sess, &cstore, krate, &id, None, MakeGlobMap::No) - .expect("phase_2 returned `None`") + driver::phase_2_configure_and_expand( + &sess, &cstore, krate, &id, None, MakeGlobMap::No, |_| Ok(()), + ).expect("phase_2 returned `None`") }; let arenas = ty::CtxtArenas::new(); |