---

yaml
---
r: 30366
b: refs/heads/incoming
c: fe9f055
h: refs/heads/master
v: v3

Author: nikomatsakis

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

branches/incoming/src/rustc/metadata/tydecode.rs

@@ -274,7 +274,7 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
         parse_ty_rust_fn(st, conv)
       }
       'X' => {
-        return ty::mk_var(st.tcx, ty::tv_vid(parse_int(st) as uint));
+        return ty::mk_var(st.tcx, ty::ty_vid(parse_int(st) as uint));
       }
       'Y' => return ty::mk_type(st.tcx),
       'C' => {

branches/incoming/src/rustc/metadata/tyencode.rs

@@ -274,11 +274,11 @@ fn enc_sty(w: io::Writer, cx: @ctxt, st: ty::sty) {
       ty::ty_fn(f) => {
         enc_ty_fn(w, cx, f);
       }
-      ty::ty_var(id) => {
+      ty::ty_infer(ty::TyVar(id)) => {
         w.write_char('X');
         w.write_uint(id.to_uint());
       }
-      ty::ty_var_integral(id) => {
+      ty::ty_infer(ty::IntVar(id)) => {
         w.write_char('X');
         w.write_char('I');
         w.write_uint(id.to_uint());

branches/incoming/src/rustc/middle/trans/reflect.rs

@@ -272,8 +272,7 @@ impl reflector {
 
           // Miscallaneous extra types
           ty::ty_trait(_, _, _) => self.leaf(~"trait"),
-          ty::ty_var(_) => self.leaf(~"var"),
-          ty::ty_var_integral(_) => self.leaf(~"var_integral"),
+          ty::ty_infer(_) => self.leaf(~"infer"),
           ty::ty_param(p) => self.visit(~"param", ~[self.c_uint(p.idx)]),
           ty::ty_self => self.leaf(~"self"),
           ty::ty_type => self.leaf(~"type"),

branches/incoming/src/rustc/middle/trans/shape.rs

@@ -363,7 +363,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
         ~[shape_bare_fn],
       ty::ty_opaque_closure_ptr(_) =>
         ~[shape_opaque_closure_ptr],
-      ty::ty_var(_) | ty::ty_var_integral(_) | ty::ty_self =>
+      ty::ty_infer(_) | ty::ty_self =>
         ccx.sess.bug(~"shape_of: unexpected type struct found")
     }
 }

branches/incoming/src/rustc/middle/trans/type_of.rs

@@ -171,11 +171,8 @@ fn type_of(cx: @crate_ctxt, t: ty::t) -> TypeRef {
         common::T_named_struct(llvm_type_name(cx, a_class, did, substs.tps))
       }
       ty::ty_self => cx.tcx.sess.unimpl(~"type_of: ty_self"),
-      ty::ty_var(_) => cx.tcx.sess.bug(~"type_of with ty_var"),
+      ty::ty_infer(*) => cx.tcx.sess.bug(~"type_of with ty_infer"),
       ty::ty_param(*) => cx.tcx.sess.bug(~"type_of with ty_param"),
-      ty::ty_var_integral(_) => {
-        cx.tcx.sess.bug(~"type_of shouldn't see a ty_var_integral");
-      }
     };
 
     cx.lltypes.insert(t, llty);