---

yaml
---
r: 27730
b: refs/heads/try
c: a9979c0
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 6d2bef53aa99564c2da205fb7e17271707d0a03b
+refs/heads/try: a9979c0ae45eee5e6446b389b7f5cc12bfaf5519
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/typeck/infer.rs

@@ -291,16 +291,16 @@ enum var_value<V:copy, T:copy> {
     root(T, uint),
 }
 
-type vals_and_bindings<V:copy, T:copy> = {
-    vals: smallintmap<var_value<V, T>>,
-    mut bindings: ~[(V, var_value<V, T>)]
-};
+struct vals_and_bindings<V:copy, T:copy> {
+    vals: smallintmap<var_value<V, T>>;
+    mut bindings: ~[(V, var_value<V, T>)];
+}
 
-enum node<V:copy, T:copy> = {
-    root: V,
-    possible_types: T,
-    rank: uint,
-};
+struct node<V:copy, T:copy> {
+    root: V;
+    possible_types: T;
+    rank: uint;
+}
 
 enum infer_ctxt = @{
     tcx: ty::ctxt,
@@ -353,7 +353,10 @@ type ures = result::result<(), ty::type_err>;
 type fres<T> = result::result<T, fixup_err>;
 
 fn new_vals_and_bindings<V:copy, T:copy>() -> vals_and_bindings<V, T> {
-    {vals: smallintmap::mk(), mut bindings: ~[]}
+    vals_and_bindings {
+        vals: smallintmap::mk(),
+        mut bindings: ~[]
+    }
 }
 
 fn new_infer_ctxt(tcx: ty::ctxt) -> infer_ctxt {
@@ -727,15 +730,15 @@ impl infer_ctxt {
           some(var_val) => {
             match var_val {
               redirect(vid) => {
-                let nde = self.get(vb, vid);
-                if nde.root != vid {
+                let node = self.get(vb, vid);
+                if node.root != vid {
                     // Path compression
-                    vb.vals.insert(vid.to_uint(), redirect(nde.root));
+                    vb.vals.insert(vid.to_uint(), redirect(node.root));
                 }
-                nde
+                node
               }
               root(pt, rk) => {
-                node({root: vid, possible_types: pt, rank: rk})
+                node {root: vid, possible_types: pt, rank: rk}
               }
             }
           }