diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2014-04-15 22:43:24 +0200 |
|---|---|---|
| committer | Flavio Percoco <flaper87@gmail.com> | 2014-04-23 18:19:19 +0200 |
| commit | 13c8edfa2ea8f3083dfadda4234c2b48d57a1c6e (patch) | |
| tree | 341c5d20596233a67a824f1ddf742db55006770c | |
| parent | 71f054ddd02051928e8e60356ecd95cb0b3f64e6 (diff) | |
| download | rust-13c8edfa2ea8f3083dfadda4234c2b48d57a1c6e.tar.gz rust-13c8edfa2ea8f3083dfadda4234c2b48d57a1c6e.zip | |
rustc: remove usage of root_map from astencode
| -rw-r--r-- | src/librustc/driver/driver.rs | 10 | ||||
| -rw-r--r-- | src/librustc/middle/astencode.rs | 1 | ||||
| -rw-r--r-- | src/librustc/middle/const_eval.rs | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index cf0e7e161c1..ebac18086c0 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -359,11 +359,10 @@ pub fn phase_3_run_analysis_passes(sess: Session, time(time_passes, "liveness checking", (), |_| middle::liveness::check_crate(&ty_cx, &capture_map, krate)); - let root_map = - time(time_passes, "borrow checking", (), |_| - middle::borrowck::check_crate(&ty_cx, &moves_map, - &moved_variables_set, - &capture_map, krate)); + time(time_passes, "borrow checking", (), |_| + middle::borrowck::check_crate(&ty_cx, &moves_map, + &moved_variables_set, + &capture_map, krate)); drop(moves_map); drop(moved_variables_set); @@ -391,7 +390,6 @@ pub fn phase_3_run_analysis_passes(sess: Session, exported_items: exported_items, public_items: public_items, maps: astencode::Maps { - root_map: root_map, capture_map: RefCell::new(capture_map) }, reachable: reachable_map diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 08133a8b69e..7f3757c478c 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -54,7 +54,6 @@ use writer = serialize::ebml::writer; // Auxiliary maps of things to be encoded pub struct Maps { - pub root_map: middle::borrowck::root_map, pub capture_map: RefCell<middle::moves::CaptureMap>, } diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index cd3ab100e55..6a2262aeaef 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -24,7 +24,6 @@ use syntax::visit; use syntax::{ast, ast_map, ast_util}; use std::cell::RefCell; -use collections::HashMap; use std::rc::Rc; // @@ -127,7 +126,6 @@ pub fn lookup_variant_by_id(tcx: &ty::ctxt, None => {} } let maps = astencode::Maps { - root_map: HashMap::new(), capture_map: RefCell::new(NodeMap::new()) }; let e = match csearch::maybe_get_item_ast(tcx, enum_def, @@ -166,7 +164,6 @@ pub fn lookup_const_by_id(tcx: &ty::ctxt, def_id: ast::DefId) None => {} } let maps = astencode::Maps { - root_map: HashMap::new(), capture_map: RefCell::new(NodeMap::new()) }; let e = match csearch::maybe_get_item_ast(tcx, def_id, |