---

yaml
---
r: 29906
b: refs/heads/incoming
c: 0ace896
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 2b3c86cb02803e569d4f5b6891d439c9daa0b90a
+refs/heads/incoming: 0ace896d1feb5d165e24bfaeba67e113eeb4ba9b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/typeck/check/regionmanip.rs

@@ -60,9 +60,14 @@ fn replace_bound_regions_in_fn_ty(
 
     // Glue updated self_ty back together with its original def_id.
     let new_self_info = match self_info {
-        some(s) => match check t_self {
-          some(t) => some({self_ty: t with s})
-          // this 'none' case shouldn't happen
+        some(s) => {
+            match t_self {
+                some(t) => some({self_ty: t with s}),
+                none => {
+                    tcx.sess.bug(~"unexpected t_self in \
+                                   replace_bound_regions_in_fn_ty()");
+                }
+            }
         },
         none => none
     };