---

yaml
---
r: 42709
b: refs/heads/try
c: 923b315
h: refs/heads/master
i:
  42707: 71d263d
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 19e015c44a9f5b911ac7ffa105395d442ece8fda
+refs/heads/try: 923b3154c6b69748e951b04d874b7a28eb3cedf9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/metadata/tydecode.rs

@@ -323,9 +323,6 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
       'f' => {
         parse_ty_rust_fn(st, conv)
       }
-      'X' => {
-        return ty::mk_var(st.tcx, ty::TyVid(parse_int(st) as uint));
-      }
       'Y' => return ty::mk_type(st.tcx),
       'C' => {
         let proto = parse_proto(st);

branches/try/src/librustc/metadata/tyencode.rs

@@ -298,19 +298,8 @@ fn enc_sty(w: io::Writer, cx: @ctxt, +st: ty::sty) {
       ty::ty_fn(ref f) => {
         enc_ty_fn(w, cx, (*f));
       }
-      ty::ty_infer(ty::TyVar(id)) => {
-        w.write_char('X');
-        w.write_uint(id.to_uint());
-      }
-      ty::ty_infer(ty::IntVar(id)) => {
-        w.write_char('X');
-        w.write_char('I');
-        w.write_uint(id.to_uint());
-      }
-      ty::ty_infer(ty::FloatVar(id)) => {
-        w.write_char('X');
-        w.write_char('F');
-        w.write_uint(id.to_uint());
+      ty::ty_infer(_) => {
+        cx.diag.handler().bug(~"Cannot encode inference variable types");
       }
       ty::ty_param({idx: id, def_id: did}) => {
         w.write_char('p');