---

yaml
---
r: 21198
b: refs/heads/snap-stage3
c: 0ace896
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2b3c86cb02803e569d4f5b6891d439c9daa0b90a
+refs/heads/snap-stage3: 0ace896d1feb5d165e24bfaeba67e113eeb4ba9b
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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
     };