bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixed refs being marked used mutably on mut deref

Browse source 
Boxes are the exception - since a Box is as mutable as its contents.
This commit is contained in:
Isaac van Bakel 2017-07-31 19:38:20 +01:00
parent e772c28d2e
commit 35b9bd0559
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_borrowck/borrowck/gather_loans/mod.rs
View file

@ -441,6 +441,19 @@ impl<'a, 'tcx> GatherLoanCtxt<'a, 'tcx> {
LpUpvar(ty::UpvarId{ var_id: local_id, closure_expr_id: _ }) => { LpUpvar(ty::UpvarId{ var_id: local_id, closure_expr_id: _ }) => {
self.tcx().used_mut_nodes.borrow_mut().insert(local_id); self.tcx().used_mut_nodes.borrow_mut().insert(local_id);
} }
LpExtend(ref base, mc::McInherited, LpDeref(pointer_kind)) |
LpExtend(ref base, mc::McDeclared, LpDeref(pointer_kind)) => {
match base.kind {
LpVar(_) if pointer_kind != mc::Unique => {
// If you mutate the inside of a ref var, the var itself
// is not used mutably [Issue #25049]
// Unless it's a Box! (mc::Unique)
}
_ => {
self.mark_loan_path_as_mutated(&base);
}
}
}
LpDowncast(ref base, _) | LpDowncast(ref base, _) |
LpExtend(ref base, mc::McInherited, _) | LpExtend(ref base, mc::McInherited, _) |
LpExtend(ref base, mc::McDeclared, _) => { LpExtend(ref base, mc::McDeclared, _) => {