---

yaml
---
r: 31433
b: refs/heads/dist-snap
c: 94f29e0
h: refs/heads/master
i:
  31431: ca1b83a
v: v3

Author: eholk

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 0a8b794a3aacab528c64a0a656105d0ad5f44ee3
+refs/heads/dist-snap: 94f29e0c9485e2867c6e48cdf74ff7ca1b764e4b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libstd/smallintmap.rs

@@ -27,7 +27,7 @@ fn mk<T: copy>() -> smallintmap<T> {
  */
 #[inline(always)]
 fn insert<T: copy>(self: smallintmap<T>, key: uint, val: T) {
-    //#error("inserting key %?", key);
+    //io::println(#fmt("%?", key));
     self.v.grow_set_elt(key, none, some(val));
 }
 

branches/dist-snap/src/rustc/middle/typeck/check.rs

@@ -109,7 +109,7 @@ type fn_ctxt_ =
 
      in_scope_regions: isr_alist,
 
-     node_types: smallintmap::smallintmap<ty::t>,
+     node_types: hashmap<ast::node_id, ty::t>,
      node_type_substs: hashmap<ast::node_id, ty::substs>,
 
      ccx: @crate_ctxt};
@@ -132,7 +132,7 @@ fn blank_fn_ctxt(ccx: @crate_ctxt, rty: ty::t,
                mut region_lb: region_bnd,
                mut region_ub: region_bnd,
                in_scope_regions: @nil,
-               node_types: smallintmap::mk(),
+               node_types: map::int_hash(),
                node_type_substs: map::int_hash(),
                ccx: ccx})
 }
@@ -218,7 +218,7 @@ fn check_fn(ccx: @crate_ctxt,
             {infcx: infer::new_infer_ctxt(tcx),
              locals: int_hash(),
              purity: decl.purity,
-             node_types: smallintmap::mk(),
+             node_types: map::int_hash(),
              node_type_substs: map::int_hash()}
           }
           some(fcx) {
@@ -490,7 +490,7 @@ impl methods for @fn_ctxt {
     fn write_ty(node_id: ast::node_id, ty: ty::t) {
         #debug["write_ty(%d, %s) in fcx %s",
                node_id, ty_to_str(self.tcx(), ty), self.tag()];
-        self.node_types.insert(node_id as uint, ty);
+        self.node_types.insert(node_id, ty);
     }
     fn write_substs(node_id: ast::node_id, +substs: ty::substs) {
         if !ty::substs_is_noop(substs) {
@@ -515,7 +515,7 @@ impl methods for @fn_ctxt {
     }
 
     fn expr_ty(ex: @ast::expr) -> ty::t {
-        alt self.node_types.find(ex.id as uint) {
+        alt self.node_types.find(ex.id) {
           some(t) { t }
           none {
             self.tcx().sess.bug(#fmt["no type for expr %d (%s) in fcx %s",
@@ -524,7 +524,7 @@ impl methods for @fn_ctxt {
         }
     }
     fn node_ty(id: ast::node_id) -> ty::t {
-        alt self.node_types.find(id as uint) {
+        alt self.node_types.find(id) {
           some(t) { t }
           none {
             self.tcx().sess.bug(

branches/dist-snap/src/rustc/middle/typeck/check/writeback.rs

@@ -59,7 +59,7 @@ fn resolve_type_vars_for_node(wbcx: wb_ctxt, sp: span, id: ast::node_id)
 fn maybe_resolve_type_vars_for_node(wbcx: wb_ctxt, sp: span,
                                     id: ast::node_id)
     -> option<ty::t> {
-    if wbcx.fcx.node_types.contains_key(id as uint) {
+    if wbcx.fcx.node_types.contains_key(id) {
         resolve_type_vars_for_node(wbcx, sp, id)
     } else {
         none