---

yaml
---
r: 52117
b: refs/heads/dist-snap
c: 1070cc0
h: refs/heads/master
i:
  52115: 493d8bc
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 6c18c75f2d1d9c491f288724d355c11d3788d123
+refs/heads/dist-snap: 1070cc0109661d9f47a6e2c39ad853041ddf30e2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/ty.rs

@@ -1606,11 +1606,18 @@ fn subst(cx: ctxt,
             fold_regions_and_ty(
                 cx, typ,
                 |r| match r {
-                    re_bound(br_self) => substs.self_r.expect(
-                        fmt!("ty::subst: \
-                      Reference to self region when given substs with no \
-                      self region, ty = %s",
-                      ::util::ppaux::ty_to_str(cx, typ))),
+                    re_bound(br_self) => {
+                        match substs.self_r {
+                            None => {
+                                cx.sess.bug(
+                                    fmt!("ty::subst: \
+                                  Reference to self region when given substs \
+                                  with no self region, ty = %s",
+                                  ::util::ppaux::ty_to_str(cx, typ)))
+                            }
+                            Some(self_r) => self_r
+                        }
+                    }
                     _ => r
                 },
                 |t| do_subst(cx, substs, t),