---

yaml
---
r: 3644
b: refs/heads/master
c: 0eac640
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05954f37b76e6357fe8c162008176b3477e7b5a8
+refs/heads/master: 0eac640fdd56caa93d5f398a75d24e62feef4730

trunk/src/comp/middle/typeck.rs

@@ -2120,8 +2120,8 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
                         auto found = false;
                         for (ty::field bf in base_fields) {
                             if (str::eq(f.ident, bf.ident)) {
-                                demand::simple(fcx, expr.span, f.mt.ty,
-                                               bf.mt.ty);
+                                demand::simple(fcx, expr.span, bf.mt.ty,
+                                               f.mt.ty);
                                 found = true;
                             }
                         }

trunk/src/test/compile-fail/rec-extend.rs

@@ -0,0 +1,9 @@
+// xfail-stage0
+// error-pattern:expected int but found bool
+
+fn main() {
+
+  auto a = rec(foo = 0);
+
+  auto b = rec(foo = true with a);
+}