Skip to content

Commit 7cbef85

Browse files
author
Cameron Zwarich
committed
---
yaml --- r: 116722 b: refs/heads/snap-stage3 c: 8c0e1ce h: refs/heads/master v: v3
1 parent 92577d1 commit 7cbef85

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d2d8fa2a0980fc6bf1a842cfff7d77ae9b95185f
4+
refs/heads/snap-stage3: 8c0e1ce6c9410f4d928923ee93e7b5a4674ae2ed
55
refs/heads/try: 009d898a9422ac04c1aa60c0e9aff3abc5fa4672
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/borrowck/check_loans.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ impl<'a> CheckLoanCtxt<'a> {
454454
}
455455
Some(move_kind) => {
456456
self.check_for_move_of_borrowed_path(id, span,
457-
&lp, move_kind);
457+
&*lp, move_kind);
458458
if move_kind == move_data::Captured {
459459
MovedInCapture
460460
} else {
@@ -474,20 +474,20 @@ impl<'a> CheckLoanCtxt<'a> {
474474
fn check_for_move_of_borrowed_path(&self,
475475
id: ast::NodeId,
476476
span: Span,
477-
move_path: &Rc<LoanPath>,
477+
move_path: &LoanPath,
478478
move_kind: move_data::MoveKind) {
479-
match self.analyze_move_out_from(id, &**move_path) {
479+
match self.analyze_move_out_from(id, move_path) {
480480
MoveOk => { }
481481
MoveWhileBorrowed(loan_path, loan_span) => {
482482
let err_message = match move_kind {
483483
move_data::Captured =>
484484
format!("cannot move `{}` into closure because it is borrowed",
485-
self.bccx.loan_path_to_str(&**move_path).as_slice()),
485+
self.bccx.loan_path_to_str(move_path).as_slice()),
486486
move_data::Declared |
487487
move_data::MoveExpr |
488488
move_data::MovePat =>
489489
format!("cannot move out of `{}` because it is borrowed",
490-
self.bccx.loan_path_to_str(&**move_path).as_slice())
490+
self.bccx.loan_path_to_str(move_path).as_slice())
491491
};
492492

493493
self.bccx.span_err(span, err_message.as_slice());

0 commit comments

Comments
 (0)