---

yaml
---
r: 30011
b: refs/heads/incoming
c: 0f0a977
h: refs/heads/master
i:
  30009: f074c4d
  30007: 9ab3e1f
v: v3

Author: msullivan

[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: 5d5cfcc005f0658b257225b7809db3f18b03be77
+refs/heads/incoming: 0f0a9775bae31169153d36dfa586e899c90921d5
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -2323,27 +2323,24 @@ fn ty_param_bounds_and_ty_for_def(fcx: @fn_ctxt, sp: span, defn: ast::def) ->
       ast::def_upvar(_, inner, _, _) => {
         return ty_param_bounds_and_ty_for_def(fcx, sp, *inner);
       }
-      ast::def_ty_param(did, n) => {
-        return no_params(ty::mk_param(fcx.ccx.tcx, n, did));
-      }
-      ast::def_ty(_) | ast::def_prim_ty(_) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found type");
+      ast::def_ty(_) | ast::def_prim_ty(_) | ast::def_ty_param(*)=> {
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found type");
       }
       ast::def_mod(*) | ast::def_foreign_mod(*) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found module");
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found module");
       }
       ast::def_use(*) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found use");
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found use");
       }
       ast::def_region(*) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found region");
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found region");
       }
       ast::def_typaram_binder(*) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found type \
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found type \
                                           parameter");
       }
       ast::def_label(*) => {
-        fcx.ccx.tcx.sess.span_fatal(sp, ~"expected value but found label");
+        fcx.ccx.tcx.sess.span_bug(sp, ~"expected value but found label");
       }
     }
 }