---

yaml
---
r: 15333
b: refs/heads/try
c: 5a3875e
h: refs/heads/master
i:
  15331: e622a41
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3ef620bf927bd1caf1cdf2b902d37678ed5bb167
+refs/heads/try: 5a3875e998ad2583978bfc8f0e6d1533b10fbea4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -528,11 +528,14 @@ impl unify_methods for infer_ctxt {
         }
     }
 
-    fn flds(a: ty::field, b: ty::field) -> ures {
-        if a.ident != b.ident {
-            ret self.uerr(ty::terr_record_fields(a.ident, b.ident));
+    /* mk_subty passes the "smaller" type as the first argument
+     and the "bigger" type as the second -- so the first arg
+    is the actual type, and the second is the expected type */
+    fn flds(a: ty::field, e: ty::field) -> ures {
+        if e.ident != a.ident {
+            ret self.uerr(ty::terr_record_fields(e.ident, a.ident));
         }
-        self.mts(a.mt, b.mt)
+        self.mts(a.mt, e.mt)
     }
 
     fn tps(as: [ty::t], bs: [ty::t]) -> ures {
@@ -1087,13 +1090,13 @@ fn c_fieldvecs<C:combine>(self: C, as: [ty::field], bs: [ty::field])
     }
 }
 
-fn c_flds<C:combine>(self: C, a: ty::field, b: ty::field) -> cres<ty::field> {
-    if a.ident == b.ident {
-        self.c_mts(a.mt, b.mt).chain {|mt|
-            ok({ident: a.ident, mt: mt})
+fn c_flds<C:combine>(self: C, e: ty::field, a: ty::field) -> cres<ty::field> {
+    if e.ident == a.ident {
+        self.c_mts(e.mt, a.mt).chain {|mt|
+            ok({ident: e.ident, mt: mt})
         }
     } else {
-        err(ty::terr_record_fields(a.ident, b.ident))
+        err(ty::terr_record_fields(e.ident, a.ident))
     }
 }