Skip to content

Commit a8e47d1

Browse files
author
Cameron Zwarich
committed
---
yaml --- r: 117781 b: refs/heads/auto c: 8c0e1ce h: refs/heads/master i: 117779: 9aeccb2 v: v3
1 parent 4b99f80 commit a8e47d1

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: d2d8fa2a0980fc6bf1a842cfff7d77ae9b95185f
16+
refs/heads/auto: 8c0e1ce6c9410f4d928923ee93e7b5a4674ae2ed
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)