diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-12-26 11:01:16 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-12-27 12:30:36 +1300 |
| commit | 4b92a5a229ebe7635851fc7bad94108f9de8dcc6 (patch) | |
| tree | a8008344fa0d47c27e882bc2942bcd95f50f985b /src/librustc_driver | |
| parent | dbde7419cc120d97e520063682751dfc3a901fb5 (diff) | |
| download | rust-4b92a5a229ebe7635851fc7bad94108f9de8dcc6.tar.gz rust-4b92a5a229ebe7635851fc7bad94108f9de8dcc6.zip | |
Rebasing changes
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/driver.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index f132ede06a4..4ab5c19430b 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -343,10 +343,11 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session, middle::lang_items::collect_language_items(krate, &sess)); let make_glob_map = if save_analysis(&sess) { - middle::resolve::MakeGlobMap::Yes + resolve::MakeGlobMap::Yes } else { - middle::resolve::MakeGlobMap::No + resolve::MakeGlobMap::No }; + let resolve::CrateMap { def_map, freevars, capture_mode_map, @@ -358,6 +359,7 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session, } = time(time_passes, "resolution", (), |_| resolve::resolve_crate(&sess, + &ast_map, &lang_items, krate, make_glob_map)); |