---

yaml
---
r: 160662
b: refs/heads/master
c: 21fe017
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 09d67fd777be1a0ab751007e6787add2b927909f
+refs/heads/master: 21fe017ab0114160c27ead73cb8515074aae0e1d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
 refs/heads/try: 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe

trunk/src/librustc/middle/borrowck/mod.rs

@@ -386,10 +386,11 @@ impl<'tcx> LoanPath<'tcx> {
             (&LpExtend(ref base, a, LpInterior(id)),
              &LpExtend(ref base2, _, LpInterior(id2))) => {
                 if id == id2 {
-                    assert!(self.ty == other.ty);
                     base.common(&**base2).map(|x| {
                         let xd = x.depth();
                         if base.depth() == xd && base2.depth() == xd {
+                            assert_eq!(base.ty, base2.ty);
+                            assert_eq!(self.ty, other.ty);
                             LoanPath {
                                 kind: LpExtend(Rc::new(x), a, LpInterior(id)),
                                 ty: self.ty,
@@ -406,15 +407,15 @@ impl<'tcx> LoanPath<'tcx> {
             (_, &LpExtend(ref other, _, LpDeref(_))) => self.common(&**other),
             (&LpVar(id), &LpVar(id2)) => {
                 if id == id2 {
-                    assert!(self.ty == other.ty);
+                    assert_eq!(self.ty, other.ty);
                     Some(LoanPath { kind: LpVar(id), ty: self.ty })
                 } else {
                     None
                 }
             }
             (&LpUpvar(id), &LpUpvar(id2)) => {
                 if id == id2 {
-                    assert!(self.ty == other.ty);
+                    assert_eq!(self.ty, other.ty);
                     Some(LoanPath { kind: LpUpvar(id), ty: self.ty })
                 } else {
                     None