mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librustc: De-@mut the moved variables set

Browse Source
This commit is contained in:
Patrick Walton 2013-12-21 17:20:42 -08:00
parent 7cb234bee9
commit 522743c9db
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc/middle/borrowck/gather_loans/lifetime.rs
View File

@ -305,7 +305,10 @@ impl<'a> GuaranteeLifetimeContext<'a> {
mc::cat_local(id) |
mc::cat_self(id) |
mc::cat_arg(id) => {
self.bccx.moved_variables_set.contains(&id)
let moved_variables_set = self.bccx
.moved_variables_set
.borrow();
moved_variables_set.get().contains(&id)
}
mc::cat_rvalue(..) |
mc::cat_static_item |

10
src/librustc/middle/moves.rs
View File

@ -169,7 +169,7 @@ pub type MovesMap = @RefCell<HashSet<NodeId>>;
* Note: The `VariableMovesMap` stores expression ids that
* are moves, whereas this set stores the ids of the variables
* that are moved at some point */
pub type MovedVariablesSet = @mut HashSet<NodeId>;
pub type MovedVariablesSet = @RefCell<HashSet<NodeId>>;
/** See the section Output on the module comment for explanation. */
#[deriving(Clone)]
@ -217,7 +217,7 @@ pub fn compute_moves(tcx: ty::ctxt,
move_maps: MoveMaps {
moves_map: @RefCell::new(HashSet::new()),
capture_map: @RefCell::new(HashMap::new()),
moved_variables_set: @mut HashSet::new()
moved_variables_set: @RefCell::new(HashSet::new())
}
};
let visit_cx = &mut visit_cx;
@ -344,7 +344,11 @@ impl VisitContext {
let def = self.tcx.def_map.get_copy(&expr.id);
let r = moved_variable_node_id_from_def(def);
for &id in r.iter() {
self.move_maps.moved_variables_set.insert(id);
let mut moved_variables_set =
self.move_maps
.moved_variables_set
.borrow_mut();
moved_variables_set.get().insert(id);
}
}
Read => {}