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

Make analyze_move_out_from take a BorrowKind

Browse Source 
Currently analyze_move_out_from ignores the BorrowKind of loans, but the
same logic is useful when restricted to loans of specific borrow kinds.
This commit is contained in:
Cameron Zwarich 2014-06-13 20:48:09 -07:00
parent 45a1b97764
commit 24b1b79cf1
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,7 +476,10 @@ fn check_for_move_of_borrowed_path(&self,
span: Span,
move_path: &LoanPath,
move_kind: move_data::MoveKind) {
match self.analyze_move_out_from(id, move_path) {
// We want to detect if there are any loans at all, so we search for
// any loans incompatible with MutBorrrow, since all other kinds of
// loans are incompatible with that.
match self.analyze_move_out_from(id, move_path, ty::MutBorrow) {
MoveOk => { }
MoveWhileBorrowed(loan_path, loan_span) => {
let err_message = match move_kind {
@ -865,7 +868,8 @@ pub fn report_illegal_mutation(&self,
pub fn analyze_move_out_from(&self,
expr_id: ast::NodeId,
move_path: &LoanPath)
move_path: &LoanPath,
borrow_kind: ty::BorrowKind)
-> MoveError {
debug!("analyze_move_out_from(expr_id={:?}, move_path={})",
self.tcx().map.node_to_str(expr_id),
@ -881,9 +885,12 @@ pub fn analyze_move_out_from(&self,
// let y = a; // Conflicts with restriction
self.each_in_scope_restriction(expr_id, move_path, |loan, _restr| {
// Any restriction prevents moves.
ret = MoveWhileBorrowed(loan.loan_path.clone(), loan.span);
false
if incompatible(loan.kind, borrow_kind) {
ret = MoveWhileBorrowed(loan.loan_path.clone(), loan.span);
false
} else {
true
}
});
// Next, we must check for *loans* (not restrictions) on the path P or
@ -901,8 +908,8 @@ pub fn analyze_move_out_from(&self,
let mut loan_path = move_path;
loop {
self.each_in_scope_loan(expr_id, |loan| {
// Any restriction prevents moves.
if *loan.loan_path == *loan_path {
if *loan.loan_path == *loan_path &&
incompatible(loan.kind, borrow_kind) {
ret = MoveWhileBorrowed(loan.loan_path.clone(), loan.span);
false
} else {
@ -921,5 +928,11 @@ pub fn analyze_move_out_from(&self,
}
return ret;
fn incompatible(borrow_kind1: ty::BorrowKind,
borrow_kind2: ty::BorrowKind)
-> bool {
borrow_kind1 != ty::ImmBorrow || borrow_kind2 != ty::ImmBorrow
}
}
}