OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #18802 : bkoropoff/rust/issue-18769, r=luqmana 

Drill down the loan path for `McDeclared` references as well since it might lead to an upvar.  Closes #18769
This commit is contained in:
bors 2014-11-10 16:12:03 +00:00
parent f18757305a c0a7d557db
commit a30b72bb14
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/middle/borrowck/gather_loans/mod.rs
View File

@ -395,10 +395,10 @@ impl<'a, 'tcx> GatherLoanCtxt<'a, 'tcx> {
LpUpvar(ty::UpvarId{ var_id: local_id, closure_expr_id: _ }) => {
self.tcx().used_mut_nodes.borrow_mut().insert(local_id);
}
LpExtend(ref base, mc::McInherited, _) => {
LpExtend(ref base, mc::McInherited, _) |
LpExtend(ref base, mc::McDeclared, _) => {
self.mark_loan_path_as_mutated(&**base);
}
LpExtend(_, mc::McDeclared, _) |
LpExtend(_, mc::McImmutable, _) => {
// Nothing to do.
}

12
src/test/run-pass/unboxed-closures-move-mutable.rs
View File

@ -14,7 +14,9 @@
// Test that mutating a mutable upvar in a capture-by-value unboxed
// closure does not ice (issue #18238) and marks the upvar as used
// mutably so we do not get a spurious warning about it not needing to
// be declared mutable (issue #18336).
// be declared mutable (issue #18336 and #18769)
fn set(x: &mut uint) { *x = 42; }
fn main() {
{
@ -25,4 +27,12 @@ fn main() {
let mut x = 0u;
move |:| x += 1;
}
{
let mut x = 0u;
move |&mut:| set(&mut x);
}
{
let mut x = 0u;
move |:| set(&mut x);
}
}