diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2016-11-25 13:21:19 +0200 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2016-11-28 04:18:10 +0200 |
| commit | 962633cdbbe2ce87c1311edbaa0d4e0aca022b6d (patch) | |
| tree | a878ca26d71df3b679ce9cf775cc7359aef1100d /src/librustc_driver | |
| parent | bc096549e84d1edbd051f0b42662c038dd935ff6 (diff) | |
| download | rust-962633cdbbe2ce87c1311edbaa0d4e0aca022b6d.tar.gz rust-962633cdbbe2ce87c1311edbaa0d4e0aca022b6d.zip | |
rustc: embed path resolutions into the HIR instead of keeping DefMap.
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/driver.rs | 9 | ||||
| -rw-r--r-- | src/librustc_driver/test.rs | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 9a4ecef0c0e..a1d1d110527 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -840,9 +840,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, let named_region_map = time(time_passes, "lifetime resolution", - || middle::resolve_lifetime::krate(sess, - &hir_map, - &resolutions.def_map))?; + || middle::resolve_lifetime::krate(sess, &hir_map))?; time(time_passes, "looking for entry point", @@ -859,17 +857,16 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, time(time_passes, "loop checking", - || loops::check_crate(sess, &resolutions.def_map, &hir_map)); + || loops::check_crate(sess, &hir_map)); time(time_passes, "static item recursion checking", - || static_recursion::check_crate(sess, &resolutions.def_map, &hir_map))?; + || static_recursion::check_crate(sess, &hir_map))?; let index = stability::Index::new(&hir_map); TyCtxt::create_and_enter(sess, arenas, - resolutions.def_map, resolutions.trait_map, named_region_map, hir_map, diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index a4f0e290384..464e15faeaf 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -131,12 +131,11 @@ fn test_env<F>(source_string: &str, // run just enough stuff to build a tcx: let lang_items = lang_items::collect_language_items(&sess, &ast_map); - let named_region_map = resolve_lifetime::krate(&sess, &ast_map, &resolutions.def_map); + let named_region_map = resolve_lifetime::krate(&sess, &ast_map); let region_map = region::resolve_crate(&sess, &ast_map); let index = stability::Index::new(&ast_map); TyCtxt::create_and_enter(&sess, &arenas, - resolutions.def_map, resolutions.trait_map, named_region_map.unwrap(), ast_map, |