---

yaml
---
r: 4533
b: refs/heads/master
c: bcc30cb
h: refs/heads/master
i:
  4531: 04cf4f9
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d5092ee7b549edeb8a2fc6af4c81c8efa29b85c
+refs/heads/master: bcc30cb4f638130f610b38a3095cc113a5ee3999

trunk/src/comp/middle/typeck.rs

@@ -863,9 +863,8 @@ mod collect {
 
 // Type unification
 
-// TODO: rename to just "unify"
 mod unify {
-    fn simple(fcx: &@fn_ctxt, expected: &ty::t, actual: &ty::t) ->
+    fn unify(fcx: &@fn_ctxt, expected: &ty::t, actual: &ty::t) ->
        ty::unify::result {
         ret ty::unify::unify(expected, actual, fcx.var_bindings, fcx.ccx.tcx);
     }
@@ -1014,7 +1013,7 @@ mod demand {
         }
 
 
-        alt unify::simple(fcx, expected_1, actual_1) {
+        alt unify::unify(fcx, expected_1, actual_1) {
           ures_ok(t) {
             ret mk_result(fcx, t, ty_param_subst_var_ids, implicit_boxes);
           }
@@ -1037,7 +1036,7 @@ mod demand {
 
 // Returns true if the two types unify and false if they don't.
 fn are_compatible(fcx: &@fn_ctxt, expected: &ty::t, actual: &ty::t) -> bool {
-    alt unify::simple(fcx, expected, actual) {
+    alt unify::unify(fcx, expected, actual) {
       ures_ok(_) { ret true; }
       ures_err(_) { ret false; }
     }