---

yaml
---
r: 2975
b: refs/heads/master
c: cc06bd4
h: refs/heads/master
i:
  2973: 60b6113
  2971: 8512405
  2967: 152607f
  2959: f152b03
  2943: 3f3608b
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b02b50c695dd6c79f1ca5ab77e3ce432071d943b
+refs/heads/master: cc06bd4aa5c2e6573c67098158620f7233d15995

trunk/src/comp/middle/typeck.rs

@@ -1628,6 +1628,8 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
             assert (ast::is_call_expr(e));
 
             check_expr(fcx, e);
+            demand::simple(fcx, e.span, fcx.ret_ty, expr_ty(fcx.ccx.tcx, e));
+
             write::nil_ty(fcx.ccx.tcx, a.id);
         }
 
@@ -1713,7 +1715,11 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
             auto lhs_t = expr_ty(fcx.ccx.tcx, lhs);
             alt (struct(fcx.ccx.tcx, lhs_t)) {
                 case (ty::ty_chan(?it)) { item_t = it; }
-                case (_) { fail; }
+                case (_) {
+                    fcx.ccx.tcx.sess.span_err(expr.span,
+                        #fmt("mismatched types: expected chan but found %s",
+                             ty_to_str(fcx.ccx.tcx, lhs_t)));
+                }
             }
 
             write::ty_only_fixup(fcx, a.id, chan_t);
@@ -1742,6 +1748,9 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
 
                     auto thn_t = block_ty(fcx.ccx.tcx, thn);
                     auto elsopt_t = expr_ty(fcx.ccx.tcx, els);
+
+                    demand::simple(fcx, expr.span, thn_t, elsopt_t);
+
                     if (!ty::type_is_bot(fcx.ccx.tcx, elsopt_t)) {
                         elsopt_t
                     } else {
@@ -1790,6 +1799,9 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
             check_expr(fcx, cond);
             check_block(fcx, body);
 
+            demand::simple(fcx, cond.span, ty::mk_bool(fcx.ccx.tcx),
+                           expr_ty(fcx.ccx.tcx, cond));
+
             auto typ = ty::mk_nil(fcx.ccx.tcx);
             write::ty_only_fixup(fcx, a.id, typ);
         }