nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make analyze_move_out_from use a loop rather than recursion

Browse Source 
It will be simpler to make some of the changes that I need to make to
analyze_move_out if it uses a loop rather than recursion.
This commit is contained in:
Cameron Zwarich 2014-06-13 20:48:09 -07:00
parent 3851d68a27
commit d2d8fa2a09
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/librustc/middle/borrowck/check_loans.rs
View File

@ -874,23 +874,30 @@ impl<'a> CheckLoanCtxt<'a> {
// We must check every element of a move path. See
// `borrowck-move-subcomponent.rs` for a test case.
// check for a conflicting loan:
let mut ret = MoveOk;
self.each_in_scope_restriction(expr_id, move_path, |loan, _| {
// Any restriction prevents moves.
ret = MoveWhileBorrowed(loan.loan_path.clone(), loan.span);
false
});
let mut loan_path = move_path;
loop {
// check for a conflicting loan:
self.each_in_scope_restriction(expr_id, loan_path, |loan, _| {
// Any restriction prevents moves.
ret = MoveWhileBorrowed(loan.loan_path.clone(), loan.span);
false
});
if ret != MoveOk {
return ret
}
if ret != MoveOk {
return ret
}
match *move_path {
LpVar(_) => MoveOk,
LpExtend(ref subpath, _, _) => {
self.analyze_move_out_from(expr_id, &**subpath)
match *loan_path {
LpVar(_) => {
ret = MoveOk;
break;
}
LpExtend(ref lp_base, _, _) => {
loan_path = &**lp_base;
}
}
}
ret
}
}