---

yaml
---
r: 42043
b: refs/heads/master
c: 923b315
h: refs/heads/master
i:
  42041: 41bd373
  42039: 6eab8eb
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 19e015c44a9f5b911ac7ffa105395d442ece8fda
+refs/heads/master: 923b3154c6b69748e951b04d874b7a28eb3cedf9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/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);

trunk/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');