---

yaml
---
r: 127479
b: refs/heads/try
c: 53a7c47
h: refs/heads/master
i:
  127477: 057ddc6
  127475: 4c3b33e
  127471: 223e8da
v: v3

Author: luqmana

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c4a63fabe345967e7d6b4570752ea081cae21785
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 12e0f72f517516ac4fce2aed85e6142e9b874bce
-refs/heads/try: 0111f493491c2d0a21db50ca06d978d8b5729ed1
+refs/heads/try: 53a7c47942fd55885c72cc52feb7c47bf67a222a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/borrowck/check_loans.rs

@@ -764,18 +764,17 @@ impl<'a> CheckLoanCtxt<'a> {
         return;
 
         fn mark_variable_as_used_mut(this: &CheckLoanCtxt,
-                                     cmt: mc::cmt) {
+                                     mut cmt: mc::cmt) {
             //! If the mutability of the `cmt` being written is inherited
             //! from a local variable, liveness will
             //! not have been able to detect that this variable's mutability
             //! is important, so we must add the variable to the
             //! `used_mut_nodes` table here.
 
-            let mut cmt = cmt;
             loop {
-                debug!("mark_writes_through_upvars_as_used_mut(cmt={})",
-                       cmt.repr(this.tcx()));
+                debug!("mark_variable_as_used_mut(cmt={})", cmt.repr(this.tcx()));
                 match cmt.cat.clone() {
+                    mc::cat_copied_upvar(mc::CopiedUpvar { upvar_id: id, .. }) |
                     mc::cat_local(id) | mc::cat_arg(id) => {
                         this.tcx().used_mut_nodes.borrow_mut().insert(id);
                         return;
@@ -792,7 +791,6 @@ impl<'a> CheckLoanCtxt<'a> {
 
                     mc::cat_rvalue(..) |
                     mc::cat_static_item |
-                    mc::cat_copied_upvar(..) |
                     mc::cat_deref(_, _, mc::UnsafePtr(..)) |
                     mc::cat_deref(_, _, mc::BorrowedPtr(..)) |
                     mc::cat_deref(_, _, mc::Implicit(..)) => {