---

Eric Holk · brson · commit 576dc0c7de46 · 2011-05-25T18:01:45.000-04:00
yaml --- r: 2785 b: refs/heads/master c: d72d504 h: refs/heads/master i: 2783: fcf0626 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c4a4aee91309d359b50ffb7bbd1fc20b9fcf633
+refs/heads/master: d72d50473ff320e72045cfea513eb43f0f214e21
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -2387,7 +2387,9 @@ fn check_expr(&@stmt_ctxt scx, &@ast::expr expr) {
             check_call(scx, f, args);
 
             auto fty = expr_ty(scx.fcx.ccx.tcx, f);
-            demand::simple(scx, f.span, ty::mk_nil(scx.fcx.ccx.tcx), fty);
+            auto ret_ty = ty::ret_ty_of_fn_ty(scx.fcx.ccx.tcx, fty);
+
+            demand::simple(scx, f.span, ty::mk_nil(scx.fcx.ccx.tcx), ret_ty);
 
             // FIXME: Other typechecks needed
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 4c4a4aee91309d359b50ffb7bbd1fc20b9fcf633`
	`2`	`+refs/heads/master: d72d50473ff320e72045cfea513eb43f0f214e21`