File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
branches/try2/src/librustc/middle/borrowck Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: d2d8fa2a0980fc6bf1a842cfff7d77ae9b95185f
8
+ refs/heads/try2: 8c0e1ce6c9410f4d928923ee93e7b5a4674ae2ed
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -454,7 +454,7 @@ impl<'a> CheckLoanCtxt<'a> {
454
454
}
455
455
Some ( move_kind) => {
456
456
self . check_for_move_of_borrowed_path ( id, span,
457
- & lp, move_kind) ;
457
+ & * lp, move_kind) ;
458
458
if move_kind == move_data:: Captured {
459
459
MovedInCapture
460
460
} else {
@@ -474,20 +474,20 @@ impl<'a> CheckLoanCtxt<'a> {
474
474
fn check_for_move_of_borrowed_path ( & self ,
475
475
id : ast:: NodeId ,
476
476
span : Span ,
477
- move_path : & Rc < LoanPath > ,
477
+ move_path : & LoanPath ,
478
478
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) {
480
480
MoveOk => { }
481
481
MoveWhileBorrowed ( loan_path, loan_span) => {
482
482
let err_message = match move_kind {
483
483
move_data:: Captured =>
484
484
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( ) ) ,
486
486
move_data:: Declared |
487
487
move_data:: MoveExpr |
488
488
move_data:: MovePat =>
489
489
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( ) )
491
491
} ;
492
492
493
493
self . bccx . span_err ( span, err_message. as_slice ( ) ) ;
You can’t perform that action at this time.
0 commit comments