---

yaml
---
r: 152589
b: refs/heads/try2
c: 69f4839
h: refs/heads/master
i:
  152587: fee0754
v: v3

Author: Cameron Zwarich

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 178c4fbccbc59fc7c554cb3cda33413d7d455366
+refs/heads/try2: 69f4839b926d6435df83cd80945d9f843cf60e27
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -870,34 +870,16 @@ impl<'a> CheckLoanCtxt<'a> {
             // here is to `v[*]`, and the existing restrictions were issued
             // for `v`, not `v[*]`.
             //
-            // So in this loop, we walk back up the loan path so long
-            // as the mutability of the path is dependent on a super
-            // path, and check that the super path was not borrowed.
-            //
-            // Mutability of a path can be dependent on the super path
-            // in two ways. First, it might be inherited mutability.
-            // Second, the pointee of an `&mut` pointer can only be
-            // mutated if it is found in an unaliased location, so we
-            // have to check that the owner location is not borrowed.
+            // So in this loop, we walk back up the path and look for
+            // loans, not restrictions.
 
             let full_loan_path = loan_path.clone();
             let mut loan_path = loan_path;
             loop {
                 loan_path = match *loan_path {
-                    // Peel back one layer if, for `loan_path` to be
-                    // mutable, `lp_base` must be mutable. This occurs
-                    // with inherited mutability, owned pointers and
-                    // `&mut` pointers.
-                    LpExtend(ref lp_base, mc::McInherited, _) |
-                    LpExtend(ref lp_base, _, LpDeref(mc::OwnedPtr)) |
-                    LpExtend(ref lp_base, _, LpDeref(mc::GcPtr)) |
-                    LpExtend(ref lp_base, _, LpDeref(mc::BorrowedPtr(ty::MutBorrow, _))) => {
+                    LpExtend(ref lp_base, _, _) => {
                         lp_base.clone()
                     }
-
-                    // Otherwise stop iterating
-                    LpExtend(_, mc::McDeclared, _) |
-                    LpExtend(_, mc::McImmutable, _) |
                     LpVar(_) => {
                         return;
                     }