Use the MoveReason to determine a more precise MoveKind in gather_moves.

2 files changed, 13 insertions, 8 deletions

diff --git a/src/librustc/middle/borrowck/gather_loans/gather_moves.rs b/src/librustc/middle/borrowck/gather_loans/gather_moves.rs
index 16fd03c1aad..6df47480977 100644
--- a/src/librustc/middle/borrowck/gather_loans/gather_moves.rs
+++ b/src/librustc/middle/borrowck/gather_loans/gather_moves.rs
@@ -45,10 +45,15 @@ pub fn gather_move_from_expr(bccx: &BorrowckCtxt,
                              move_data: &MoveData,
                              move_error_collector: &MoveErrorCollector,
                              move_expr_id: ast::NodeId,
-                             cmt: mc::cmt) {
+                             cmt: mc::cmt,
+                             move_reason: euv::MoveReason) {
+    let kind = match move_reason {
+        euv::DirectRefMove | euv::PatBindingMove => MoveExpr,
+        euv::CaptureMove => Captured
+    };
     let move_info = GatherMoveInfo {
         id: move_expr_id,
-        kind: MoveExpr,
+        kind: kind,
         cmt: cmt,
         span_path_opt: None,
     };
diff --git a/src/librustc/middle/borrowck/gather_loans/mod.rs b/src/librustc/middle/borrowck/gather_loans/mod.rs
index 5192ddc793b..003687e7b63 100644
--- a/src/librustc/middle/borrowck/gather_loans/mod.rs
+++ b/src/librustc/middle/borrowck/gather_loans/mod.rs
@@ -75,13 +75,13 @@ impl<'a> euv::Delegate for GatherLoanCtxt<'a> {
                consume_id, cmt.repr(self.tcx()), mode);
 
         match mode {
-            euv::Copy => { return; }
-            euv::Move(_) => { }
+            euv::Move(move_reason) => {
+                gather_moves::gather_move_from_expr(
+                    self.bccx, &self.move_data, &self.move_error_collector,
+                    consume_id, cmt, move_reason);
+            }
+            euv::Copy => { }
         }
-
-        gather_moves::gather_move_from_expr(
-            self.bccx, &self.move_data, &self.move_error_collector,
-            consume_id, cmt);
     }
 
     fn consume_pat(&mut self,