---

yaml
---
r: 152582
b: refs/heads/try2
c: 6849362
h: refs/heads/master
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: 6ca8dbfaedc9d37b9b40fd562755a358e7810266
+refs/heads/try2: 6849362f383c9c21a72cea5377c28596061c6c13
 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

@@ -294,25 +294,11 @@ impl<'a> CheckLoanCtxt<'a> {
                loan1.repr(self.tcx()),
                loan2.repr(self.tcx()));
 
-        // Restrictions that would cause the new loan to be illegal:
-        let illegal_if = match loan2.kind {
-            // Look for restrictions against mutation. These are
-            // generated by all other borrows.
-            ty::MutBorrow => RESTR_MUTATE,
-
-            // Look for restrictions against freezing (immutable borrows).
-            // These are generated by `&mut` borrows.
-            ty::ImmBorrow => RESTR_FREEZE,
-
-            // No matter how the data is borrowed (as `&`, as `&mut`,
-            // or as `&unique imm`) it will always generate a
-            // restriction against mutating the data. So look for those.
-            ty::UniqueImmBorrow => RESTR_MUTATE,
-        };
-        debug!("illegal_if={:?}", illegal_if);
+        if compatible_borrow_kinds(loan1.kind, loan2.kind) {
+            return true;
+        }
 
         for restr in loan1.restrictions.iter() {
-            if !restr.set.intersects(illegal_if) { continue; }
             if restr.loan_path != loan2.loan_path { continue; }
 
             let old_pronoun = if new_loan.loan_path == old_loan.loan_path {